commit 3cc0f58fcff246773e1a16641e55c5395b64e027
author Alex Klyubin <klyubin@google.com> Tue Jun 09 16:23:33 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 09 16:23:33 2015 +0000
tree def45dbaa6fcd6c51e1b5dac3c327ab6bfc93c2d
parent d5dac3f42dba5eed265de3d0ceef50d87eb8d422
parent 54cbbcd45903a9e216a2d0184dbe7ab332ac714c

am 54cbbcd4: Merge "Phone app might use cleartext network traffic." into mnc-dev

* commit '54cbbcd45903a9e216a2d0184dbe7ab332ac714c':
  Phone app might use cleartext network traffic.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 50741ac..8e3638a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -129,7 +129,8 @@
                  android:label="@string/phoneAppLabel"
                  android:icon="@mipmap/ic_launcher_phone"
                  android:allowBackup="false"
-                 android:supportsRtl="true">
+                 android:supportsRtl="true"
+                 android:usesCleartextTraffic="true">
             <provider android:name="IccProvider"
                       android:authorities="icc"
                       android:multiprocess="true"