| commit | f5e0370a0d6a52c0bc029ced4fcc0453bed2f7eb | [log] [tgz] |
|---|---|---|
| author | Richard Coles <torne@google.com> | Fri Dec 11 14:51:58 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Dec 11 14:51:58 2015 +0000 |
| tree | f6989b912da1a3c7ef26accf9c5ab32358357766 | |
| parent | d9e7e17b3a2b200b96f4ddc5cf2af11e7ecf17a2 [diff] | |
| parent | da95be5770770a37fe5b376108ad586c90b9c098 [diff] |
Merge "Disable Android Beam"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e97238b..bc618d5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -40,6 +40,8 @@ <data android:mimeType="application/xhtml+xml"/> <data android:mimeType="application/vnd.wap.xhtml+xml"/> </intent-filter> - </activity> + </activity> + <meta-data android:name="android.nfc.disable_beam_default" + android:value="true" /> </application> </manifest>