commit 64c82445241321dfcdbbd4499c128a0bb63b4e90
author Doris Ling <dling@google.com> Fri Apr 07 02:47:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 07 02:47:53 2017 +0000
tree 49d5fa2e4c544ed18ec20893043da7264592ee34
parent 272d65c0bce12e288f80f758839e94d1f5646ffd
parent 65682e7fa5df7d4ac3a3a04b6a89b25356a70c8a

Merge "Add summary text for Encryption & credential." into oc-dev
am: 65682e7fa5

Change-Id: I47fa8dffba03f8666972843046537dcbededef9c

res/xml/security_settings_misc.xml

diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index ade4782..86e3b16 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -60,6 +60,7 @@
     <Preference
         android:key="encryption_and_credential"
         android:title="@string/encryption_and_credential_settings_title"
+        android:summary="@string/encryption_and_credential_settings_summary"/>
         android:fragment="com.android.settings.EncryptionAndCredential"/>
 
     <Preference android:key="manage_trust_agents"