commit 21aadd1e6f3a9d2a24d6f3078cc70f2d421f3e46
author The Android Automerger <android-build@google.com> Thu Sep 24 01:06:52 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Sep 24 01:06:52 2015 -0700
tree 3957896f06c7b0514568ca7a770c8ffb3ccbbbfd
parent 8415fed4f7544099cb42d48157df6a63594c0007
parent 7a7961249a19347baef0e5319df7d378eaabbf15

merge in mnc-dr-release history after reset to mnc-dr-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9941c53..eea72fd 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -52,6 +52,7 @@
     <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
     <uses-permission android:name="com.android.permission.WHITELIST_BLUETOOTH_DEVICE" />
     <uses-permission android:name="android.permission.DISPATCH_NFC_MESSAGE" />
+    <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />
     <application android:name=".NfcApplication"
                  android:icon="@drawable/icon"
                  android:label="@string/app_name"