commit a402eb81d9cfdb4fbf20f75fa4efbc4c4436ebcd
author Geoff Mendal <mendal@google.com> Wed Dec 02 14:01:20 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 02 14:01:20 2015 +0000
tree d371a278317209555c5fbda7320055fd6c3b2b0f
parent 6ae1fb9588cd9dd95d8d59f43f8ae0d99860e592
parent a004528d314e13c5f2bdc2988598ac1d609847d1

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

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