| commit | 7f7adedaf995a3d3998fd2473b8d116fffce9e89 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Thu Apr 19 11:08:50 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 19 11:08:50 2012 -0700 |
| tree | efd23f4ff496842aadcd4896459dddeabc07a7a0 | |
| parent | ee7c1d8dc223381d4c3afce5fdbd8dc6f78091f3 [diff] | |
| parent | b34811d8be33c9eb945cbe6745a6ad2b16fe7a31 [diff] |
Merge "Prevent "Beaming" from home screen."
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>