commit 8eab8a17d6ea5baa8594d65908fd6f121db57df6
author Geoff Mendal <mendal@google.com> Wed Nov 25 16:17:28 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 25 16:17:28 2015 +0000
tree 987a3e52b53d7d50b145acfc1ba18310259cc9fd
parent bd24a05c0aa24981f07dd7db4f9a3e97588ee859
parent fb73c999806ea8000d9c258622fd7b4d0a1b2161

Import translations. DO NOT MERGE
am: fb73c99980  -s ours

* commit 'fb73c999806ea8000d9c258622fd7b4d0a1b2161':
  Import translations. DO NOT MERGE

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8254f36..e2a3871 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -67,7 +67,9 @@
         android:hardwareAccelerated="true"
         android:supportsRtl="true"
         android:backupAgent='com.android.dialer.DialerBackupAgent'
-        android:usesCleartextTraffic="false">
+        android:usesCleartextTraffic="false"
+        android:forceDeviceEncrypted="true"
+        android:encryptionAware="true">
 
         <meta-data android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAIBXgtCEKQ6W0PXVnW-ZVia2KmlV2AxsTw3GjAeQ" />