Merge "Fix malformatted preference xml." into oc-dev

am: 569a93b8bb

Change-Id: Ida4d8631bf7f36d68c9022b9ff72cd2ef3cd4995
This commit is contained in:
Fan Zhang
2017-04-19 21:54:01 +00:00
committed by android-build-merger

View File

@@ -60,7 +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:summary="@string/encryption_and_credential_settings_summary"
android:fragment="com.android.settings.EncryptionAndCredential"/>
<Preference android:key="manage_trust_agents"