commit ca3e23c6caeeb49f3fdc9556425ce211892ad00c
author Geoff Mendal <mendal@google.com> Mon Dec 14 05:56:48 2015 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 14 05:56:48 2015 -0800
tree 2188cbca43085cd66206f67abb260e519bd75a9f
parent a2304b353e141177d421fcfe8e88d4aca87b9bc3
parent 524d87169becc3137963d1c7ebba3493d0fa5e1d

Import translations. DO NOT MERGE am: e4071ea58d  -s ours
am: 524d87169b  -s ours

* commit '524d87169becc3137963d1c7ebba3493d0fa5e1d':
  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" />