| commit | 386e064ae2afca489ce132d8e907184a8dd18241 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Apr 19 11:11:31 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 19 11:11:31 2012 -0700 |
| tree | 14971514409f8409292bbb598a65955c9ac8925b | |
| parent | 7f7adedaf995a3d3998fd2473b8d116fffce9e89 [diff] | |
| parent | 131ef21ef81a25129b6ea7d0e70fd0555b3fc65e [diff] |
Merge "Import translations. DO NOT MERGE"
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>