commit 7ca17e94b01059194985d3c3fe859f164fa555aa
author Richard Coles <torne@google.com> Fri Dec 11 06:57:51 2015 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 11 06:57:51 2015 -0800
tree b990799fddfb5b7d3f2ec8bf8dc95f560939b908
parent 5af4cf9e89c488c92dab9f8bafe81b85ce237c4a
parent f5e0370a0d6a52c0bc029ced4fcc0453bed2f7eb

Merge "Disable Android Beam"
am: f5e0370a0d

* commit 'f5e0370a0d6a52c0bc029ced4fcc0453bed2f7eb':
  Disable Android Beam

AndroidManifest.xml

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>