commit d7134de3bc15f1a5d2f97062531440b2fbe8c835
author Geoff Mendal <mendal@google.com> Mon Nov 23 14:05:35 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 23 14:05:35 2015 +0000
tree 6b754a563d53a726be26e0740364ab982ed348a3
parent b0ceb8d0849fcfcf2b80914f11400acbc0becf9e
parent c39676b46477c3e653fffbc663b353ec60bb3f22

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

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

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 16be872..672b529 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" />