commit c5e5a93445a0b60a0fcb0373febec043c6425955
author Yorke Lee <yorkelee@google.com> Thu Dec 10 16:15:43 2015 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 16:15:43 2015 -0800
tree 3a65df23bc10fcec9cf4d10bea264b653becd6fa
parent 72b3739e7c1fcee41c123421c38cbd5930c4ebbc
parent 34ed64a603c15ed3ac8b423a5a83cd0da26def71

[DO NOT MERGE] Fix potential NPE in VoicemailPlaybackPresenter am: 24c462296c  -s ours
am: 34ed64a603  -s ours

* commit '34ed64a603c15ed3ac8b423a5a83cd0da26def71':
  [DO NOT MERGE] Fix potential NPE in VoicemailPlaybackPresenter

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