commit e544c7259edcd62c49e88d921c79444d0592068a
author The Android Automerger <android-build@google.com> Mon Nov 23 09:33:19 2015 -0800
committer The Android Automerger <android-build@google.com> Mon Nov 23 09:33:19 2015 -0800
tree 48ab40df891d1e87a88e75c45b8cc8d76d9b65a0
parent 0c2d80f9ef2bc402afa6f56b68955c64e9065f7e
parent bfda7b19455e28d5105276fa31b9d3f55ee3984f

merge in nyc-release history after reset to master

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 80f0a41..ff8370d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,9 +29,7 @@
                  android:allowBackup="false"
                  android:label="@string/app_label"
                  android:icon="@mipmap/ic_launcher_phone"
-                 android:usesCleartextTraffic="true"
-                 android:forceDeviceEncrypted="true"
-                 android:encryptionAware="true">
+                 android:usesCleartextTraffic="true">
 
         <provider android:name="TelephonyProvider"
                   android:authorities="telephony"