commit b68a7edb295321b0ae6a0fc8599c3f9dd418d6f1
author Yorke Lee <yorkelee@google.com> Thu Dec 10 10:00:35 2015 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 10:00:35 2015 -0800
tree b45192bba036f7841252393b5ea015e41590e35a
parent 9be75ce27783455d3f1f48a8a293b98bb138b182
parent de4f0f537884365672258bed7895e3ab367b5a7a

Fix potential NPE in VoicemailPlaybackPresenter
am: de4f0f5378

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