commit 6a6ec3c6223820ef16e9491593cb43ecf2497af1
author Geoff Mendal <mendal@google.com> Mon Nov 23 14:08:30 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 23 14:08:30 2015 +0000
tree 6b754a563d53a726be26e0740364ab982ed348a3
parent d7134de3bc15f1a5d2f97062531440b2fbe8c835
parent 6c0a9d51c709784a401eac269c03839b6a236f00

Import translations. DO NOT MERGE am: db48871711  -s ours
am: 6c0a9d51c7  -s ours

* commit '6c0a9d51c709784a401eac269c03839b6a236f00':
  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" />