commit e73a97a65de30750c4c11981738ebbdba7955d6a
author Nancy Chen <nancychen@google.com> Thu Dec 10 16:15:57 2015 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 16:15:57 2015 -0800
tree 3a65df23bc10fcec9cf4d10bea264b653becd6fa
parent e5026de5b48435882bbdb91f2355ecbc94f770a0
parent 244979eab6d17cfa59cd2beea458d5f0310b897c

Merge "[DO NOT MERGE] Bump version number from 2.3.14 to 2.3.15" into ub-contactsdialer-a-dev am: dfad2c5a1d  -s ours
am: 244979eab6  -s ours

* commit '244979eab6d17cfa59cd2beea458d5f0310b897c':
  [DO NOT MERGE] Bump version number from 2.3.14 to 2.3.15

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" />