commit 10df27a2b127322175bcf49a57ef8c7b0a2b2fcb
author Jean-Baptiste Queru <jbq@google.com> Thu Apr 12 09:21:59 2012 -0700
committer Jean-Baptiste Queru <jbq@google.com> Thu Apr 12 09:21:59 2012 -0700
tree 16fe096a3a3649f37fb5bf4299ae5bd8d5e5b172
parent 6d820c386f521231ba643c5be5599f9f64859df3
parent 447b97434ae71a6e9b4b833468c1d705ad68a2b4

resolved conflicts for merge of 447b9743 to master

Change-Id: Iffc8b1a0e373d5819948053610ac0b346f096172

generate-blob-lists.sh

diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
index e827e9b..cd75be0 100755
--- a/generate-blob-lists.sh
+++ b/generate-blob-lists.sh
@@ -42,7 +42,7 @@
 fi
 shift
 
-DEVICES="crespo crespo4g stingray wingray panda toro torospr maguro grouper"
+DEVICES="crespo crespo4g stingray wingray panda toro torospr maguro grouper manta"
 export LC_ALL=C
 
 repo sync -j32 -n

gps/gps.conf_AS

diff --git a/gps/gps.conf_AS b/gps/gps.conf_AS
index 510f656..ce3a4e2 100644
--- a/gps/gps.conf_AS
+++ b/gps/gps.conf_AS
@@ -1,4 +1,3 @@
-NTP_SERVER=asia.pool.ntp.org
 XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
 XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
 XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin

gps/gps.conf_AS_SUPL

diff --git a/gps/gps.conf_AS_SUPL b/gps/gps.conf_AS_SUPL
index 51154b9..a0e2a7d 100644
--- a/gps/gps.conf_AS_SUPL
+++ b/gps/gps.conf_AS_SUPL
@@ -1,4 +1,3 @@
-NTP_SERVER=asia.pool.ntp.org
 XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
 XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
 XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin

gps/gps.conf_EU

diff --git a/gps/gps.conf_EU b/gps/gps.conf_EU
index 49dffbe..ce3a4e2 100644
--- a/gps/gps.conf_EU
+++ b/gps/gps.conf_EU
@@ -1,4 +1,3 @@
-NTP_SERVER=europe.pool.ntp.org
 XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
 XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
 XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin

gps/gps.conf_EU_SUPL

diff --git a/gps/gps.conf_EU_SUPL b/gps/gps.conf_EU_SUPL
index 926f884..a0e2a7d 100644
--- a/gps/gps.conf_EU_SUPL
+++ b/gps/gps.conf_EU_SUPL
@@ -1,4 +1,3 @@
-NTP_SERVER=europe.pool.ntp.org
 XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
 XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
 XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin

gps/gps.conf_US

diff --git a/gps/gps.conf_US b/gps/gps.conf_US
index 5abbd5c..ce3a4e2 100644
--- a/gps/gps.conf_US
+++ b/gps/gps.conf_US
@@ -1,4 +1,3 @@
-NTP_SERVER=north-america.pool.ntp.org
 XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
 XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
 XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin

gps/gps.conf_US_SUPL

diff --git a/gps/gps.conf_US_SUPL b/gps/gps.conf_US_SUPL
index b766326..a0e2a7d 100644
--- a/gps/gps.conf_US_SUPL
+++ b/gps/gps.conf_US_SUPL
@@ -1,4 +1,3 @@
-NTP_SERVER=north-america.pool.ntp.org
 XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
 XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
 XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin