commit bb723829ab6ef48a1567aceb402d339ee036bec8
author Brandon Maxwell <maxwelb@google.com> Mon Nov 23 18:11:04 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 23 18:11:04 2015 +0000
tree bf919f838b9b47ba9a1733a0b1489e6ecea6b0f9
parent 6a6ec3c6223820ef16e9491593cb43ecf2497af1
parent be998efeacd573abb2d33da7af9172094122a025

Merge "Making calls to Resources.getColor backwards compat" into ub-contactsdialer-b-dev
am: be998efeac

* commit 'be998efeacd573abb2d33da7af9172094122a025':
  Making calls to Resources.getColor backwards compat

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