diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-06-09 17:05:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-09 17:05:15 +0000 |
| commit | bfcf92f171ec08b49f1f6dcb4b86ca3c7fecf9f9 (patch) | |
| tree | b48e44e889ea100dde938054152aa41027c8fbd2 | |
| parent | 3104ca23a0976a402a758c70d75b29197a924c77 (diff) | |
| parent | f3973456f43255ec5f72764734c5181294e958e3 (diff) | |
| download | android_packages_apps_Email-bfcf92f171ec08b49f1f6dcb4b86ca3c7fecf9f9.tar.gz android_packages_apps_Email-bfcf92f171ec08b49f1f6dcb4b86ca3c7fecf9f9.tar.bz2 android_packages_apps_Email-bfcf92f171ec08b49f1f6dcb4b86ca3c7fecf9f9.zip | |
am f3973456: Merge "Email app might use cleartext network traffic." into mnc-dev
* commit 'f3973456f43255ec5f72764734c5181294e958e3':
Email app might use cleartext network traffic.
| -rw-r--r-- | AndroidManifest.xml | 3 |
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 |