summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-06-09 16:52:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-09 16:52:20 +0000
commitf3973456f43255ec5f72764734c5181294e958e3 (patch)
tree7bad41ff5f5f2fca5d25dc4c953d6ed26bd9f3ff
parenta66673b72bca06a87cdc314aef34ea4ee0c381be (diff)
parent53db1e471868e83620b4056b7a03f7139799f733 (diff)
downloadEmail-f3973456f43255ec5f72764734c5181294e958e3.tar.gz
Merge "Email app might use cleartext network traffic." into mnc-dev
-rw-r--r--AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e0b9dd8d9..c3e33ab37 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -84,7 +84,8 @@
android:theme="@style/UnifiedEmailTheme"
android:hardwareAccelerated="true"
android:allowBackup="false"
- android:supportsRtl="true" >
+ android:supportsRtl="true"
+ android:usesCleartextTraffic="true" >
<uses-library android:name="org.apache.http.legacy" android:required="false" />
<activity