commit 2df3ec9e85585b09574c56935073ee4aa338bc17
author Geoff Mendal <mendal@google.com> Wed Dec 09 14:04:06 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 09 14:04:06 2015 +0000
tree 5ed7dcbc4e164c534cdbd82e9b7e3f8cee2c1191
parent 347c50287d6922ac9cb4aa87615cb9e04ac22899
parent 3b901327092c5d1be5c6ac0a8c82c07fd1830a4d

Import translations. DO NOT MERGE
am: 3b90132709  -s ours

* commit '3b901327092c5d1be5c6ac0a8c82c07fd1830a4d':
  Import translations. DO NOT MERGE

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9d5af42..064ce04 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" />