commit d5af13efa24e7f460628624f08255d76b66559c2
author The Android Automerger <android-build@android.com> Mon Apr 23 07:05:31 2012 -0700
committer The Android Automerger <android-build@android.com> Mon Apr 23 07:05:31 2012 -0700
tree 14971514409f8409292bbb598a65955c9ac8925b
parent 386e064ae2afca489ce132d8e907184a8dd18241
parent 28cb0824f0490960dde841802dacf090e14a92c7

merge in jb-release history after reset to master

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cbb06f6..c72d106 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -128,5 +128,7 @@
             android:writePermission="com.android.launcher.permission.WRITE_SETTINGS"
             android:readPermission="com.android.launcher.permission.READ_SETTINGS" />
 
+        <meta-data android:name="android.nfc.disable_beam_default"
+                       android:value="true" />
     </application>
 </manifest>

res/values-am/strings.xml

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9e25766..0b52376 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -65,7 +65,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"ልጣፍ"</string>
     <string name="menu_search" msgid="4826514464423239041">" ፈልግ"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"ማሳወቂያዎች"</string>
-    <string name="menu_settings" msgid="3946232973327980394">"የስርዓት ቅንጅቶች"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"የስርዓት ቅንብሮች"</string>
     <string name="menu_help" msgid="4901160661634590633">"እገዛ"</string>
     <string name="cab_menu_delete_app" msgid="4089398025537640349">"ትግበራ አራግፍ"</string>
     <string name="cab_menu_app_info" msgid="914548323652698884">"የትግበራ ዝርዝር"</string>