commit 17ba7411ec56e29d11ceb75e620ba86ac43fa95e
author Alex Klyubin <klyubin@google.com> Wed Apr 08 16:47:23 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 08 16:47:24 2015 +0000
tree b180d295be55a24f241c6c0308d415dd5d734881
parent 0ccd073c887b414b9ef9ba57166d9f5e287848b2
parent 2492ea00c8c0968cf211d954f84b02994bf01ccf

Merge "Declare that Browser app uses cleartext traffic."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9ea41e6..a1de131 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -55,7 +55,8 @@
                    android:icon="@mipmap/ic_launcher_browser"
                    android:backupAgent=".BrowserBackupAgent"
                    android:hardwareAccelerated="true"
-                   android:taskAffinity="android.task.browser" >
+                   android:taskAffinity="android.task.browser"
+                   android:usesCleartextTraffic="true" >
 
         <provider android:name=".provider.BrowserProvider2"
                   android:authorities="com.android.browser;browser"