Merge "Add summary text for Encryption & credential." into oc-dev

am: 65682e7fa5

Change-Id: I47fa8dffba03f8666972843046537dcbededef9c
This commit is contained in:
Doris Ling
2017-04-07 02:47:53 +00:00
committed by android-build-merger

View File

@@ -60,6 +60,7 @@
<Preference <Preference
android:key="encryption_and_credential" android:key="encryption_and_credential"
android:title="@string/encryption_and_credential_settings_title" android:title="@string/encryption_and_credential_settings_title"
android:summary="@string/encryption_and_credential_settings_summary"/>
android:fragment="com.android.settings.EncryptionAndCredential"/> android:fragment="com.android.settings.EncryptionAndCredential"/>
<Preference android:key="manage_trust_agents" <Preference android:key="manage_trust_agents"