commit e619f1e55fe312b5b4ad451e56dd12f73ea66a49
author John Reck <jreck@google.com> Tue May 17 13:24:38 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 17 13:24:38 2011 -0700
tree a698f378f3232b9a7cf87dd4340e9bc876d0e2c0
parent 43edbab25ab674a62dd841001d03dedb9ee55818
parent 275932ff17bcb44712ef07a1e143c3f3b0d8df8a

am 275932ff: Merge "Use tablet UI for large" into honeycomb-mr2

* commit '275932ff17bcb44712ef07a1e143c3f3b0d8df8a':
  Use tablet UI for large

res/values/all_search_engines.xml

diff --git a/res/values/all_search_engines.xml b/res/values/all_search_engines.xml
index 14aba39..58992a4 100644
--- a/res/values/all_search_engines.xml
+++ b/res/values/all_search_engines.xml
@@ -157,7 +157,7 @@
     <item></item>
   </string-array>
   <string-array name="ask_es" translatable="false">
-    <item>Ask.com Espa&#x00f1a;</item>
+    <item>Ask.com Espa&#x00f1;a</item>
     <item>es.ask.com</item>
     <item>http://es.ask.com/favicon.ico</item>
     <item>http://es.ask.com/web?q={searchTerms}</item>
@@ -357,7 +357,7 @@
     <item>http://api.bing.com/osjson.aspx?query={searchTerms}&amp;language={language}</item>
   </string-array>
   <string-array name="yahoo_es" translatable="false">
-    <item>Yahoo! Espa&#x00f1a;</item>
+    <item>Yahoo! Espa&#x00f1;a</item>
     <item>es.yahoo.com</item>
     <item>http://es.search.yahoo.com/favicon.ico</item>
     <item>http://es.search.yahoo.com/search?ei={inputEncoding}&amp;fr=crmas&amp;p={searchTerms}</item>

tools/get_search_engines.py

diff --git a/tools/get_search_engines.py b/tools/get_search_engines.py
index bd6e5f8..86393f1 100755
--- a/tools/get_search_engines.py
+++ b/tools/get_search_engines.py
@@ -86,7 +86,7 @@
     str = str.strip('"')
     str = str.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
     str = str.replace('"', '&quot;').replace('\'', '&apos;')
-    str = re.sub(r'\\x([a-fA-F0-9]+)', r'&#x\1;', str)
+    str = re.sub(r'\\x([a-fA-F0-9]{1,4})', r'&#x\1;', str)
 
     return str