commit 0faeed3b89bef7864d0fff9067ae97faa0f34823
author Nancy Chen <nancychen@google.com> Thu Nov 26 01:43:18 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 26 01:43:18 2015 +0000
tree 55144c5463257a9669b54655c223b47b40e31c91
parent c65a69316867fbdca06eb1085dec6765d3225c85
parent 9873b65aadfc712930420d304c3d600aa27ef01c

Bump 2.3.11 -> 2.3.12 for AOSP dialer. am: 4a7eaa6538
am: 9873b65aad

* commit '9873b65aadfc712930420d304c3d600aa27ef01c':
  Bump 2.3.11 -> 2.3.12 for AOSP dialer.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9051a9f..14c7806 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" />