commit 2f477d6530a8286852f7a53e896179907e7ad32e
author Steve Kondik <shade@chemlab.org> Mon Aug 27 07:39:42 2012 +0400
committer Gerrit Code Review <gerrit@review.cyanogenmod.com> Mon Aug 27 07:39:42 2012 +0400
tree 370db2056b0e29ad1ed625fc0c06816e5750c20c
parent adef242fe6699422362dc8dbaf19e37b613b40ed
parent 4576c753b528e1a4d11a15dd5baa329400085023

Merge "pngcrush: don't print out an error on mv if optimizing fails" into jellybean

jenkins-build-targets

diff --git a/jenkins-build-targets b/jenkins-build-targets
index 085ff9a..34663d3 100644
--- a/jenkins-build-targets
+++ b/jenkins-build-targets
@@ -14,6 +14,8 @@
 cm_i9100g-userdebug
 cm_jewel-userdebug
 cm_maguro-userdebug
+cm_quincyatt-userdebug
+cm_quincytmo-userdebug
 cm_p3100-userdebug
 cm_p3110-userdebug
 cm_p3113-userdebug

prebuilt/common/etc/spn-conf.xml

diff --git a/prebuilt/common/etc/spn-conf.xml b/prebuilt/common/etc/spn-conf.xml
index bc7e5d8..82e16a0 100644
--- a/prebuilt/common/etc/spn-conf.xml
+++ b/prebuilt/common/etc/spn-conf.xml
@@ -1,60 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  <spnOverrides>
-    <spnOverride numeric="MccMnc value" spn="defualt spn" />
-    <spnOverride numeric="MccMnc value" spn="defualt spn, can be omitted">
-      <spn locale="java.util.Locale string">localized spn</spn>
-      <spn locale="java.util.Locale string">localized spn</spn>
-      ...
-    </spnOverride>
-    ...
-  </spnOverrides>
--->
+
 <spnOverrides>
   <!-- Japan -->
   <spnOverride numeric="44020" spn="SoftBank" />
   <!-- Hong Kong -->
   <spnOverride numeric="45406" spn="SmarTone" />
-  <spnOverride numeric="45412">
-    <spn locale="zh">中國移動香港</spn>
-    <spn locale="zh_CN">中国移动香港</spn>
-  </spnOverride>
+  <spnOverride numeric="45412" spn="中國移動香港" />
   <!-- China -->
-  <spnOverride numeric="46000">
-    <spn locale="zh">中国移动</spn>
-  </spnOverride>
-  <spnOverride numeric="46001">
-    <spn locale="zh">中国联通</spn>
-  </spnOverride>
-  <spnOverride numeric="46002">
-    <spn locale="zh">中国移动</spn>
-  </spnOverride>
-  <spnOverride numeric="46003">
-    <spn locale="zh">中国电信</spn>
-  </spnOverride>
-  <spnOverride numeric="46007">
-    <spn locale="zh">中国移动</spn>
-  </spnOverride>
+  <spnOverride numeric="46000" spn="中国移动" />
+  <spnOverride numeric="46001" spn="中国联通" />
+  <spnOverride numeric="46002" spn="中国移动" />
+  <spnOverride numeric="46003" spn="中国电信" />
+  <spnOverride numeric="46007" spn="中国移动" />
   <!-- Taiwan -->
-  <spnOverride numeric="46601">
-    <spn locale="zh">遠傳電信</spn>
-  </spnOverride>
-  <spnOverride numeric="46688">
-    <spn locale="zh">和信電訊</spn>
-  </spnOverride>
-  <spnOverride numeric="46689">
-    <spn locale="zh">威寶電信</spn>
-  </spnOverride>
-  <spnOverride numeric="46692">
-    <spn locale="zh">中華電信</spn>
-  </spnOverride>
-  <spnOverride numeric="46693">
-    <spn locale="zh">東信電訊</spn>
-  </spnOverride>
-  <spnOverride numeric="46697">
-    <spn locale="zh">台灣大哥大</spn>
-  </spnOverride>
-  <spnOverride numeric="46699">
-    <spn locale="zh">泛亞電信</spn>
-  </spnOverride>
+  <spnOverride numeric="46601" spn="遠傳電信" />
+  <spnOverride numeric="46688" spn="和信電訊" />
+  <spnOverride numeric="46689" spn="威寶電信" />
+  <spnOverride numeric="46692" spn="中華電信" />
+  <spnOverride numeric="46693" spn="東信電訊" />
+  <spnOverride numeric="46697" spn="台灣大哥大" />
+  <spnOverride numeric="46699" spn="泛亞電信" />
 </spnOverrides>