Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41b5a551 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Fix malformatted preference xml." into oc-dev am: 569a93b8 

am: 0a9fddd6

Change-Id: I9aa9f77d224fdd63ec4c2222c510d1958e4f7166
parents 478dcb35 0a9fddd6

res/xml/security_settings_misc.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"