diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-10-17 23:14:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 23:14:01 +0000 |
| commit | 1f39d6a6e78d5fd0595306d1ed38a8f7ac04e3fe (patch) | |
| tree | 069ce25ab9e87ce465ca0f13c2cb365d06fadcab /src/com/android/settings/SettingsActivity.java | |
| parent | 140b46e43ca70e2ef13d8a3840cde20b16adba45 (diff) | |
| parent | edbada7acd2d40db1c472e291f3191c6f26d980a (diff) | |
| download | packages_apps_Settings-1f39d6a6e78d5fd0595306d1ed38a8f7ac04e3fe.tar.gz packages_apps_Settings-1f39d6a6e78d5fd0595306d1ed38a8f7ac04e3fe.tar.bz2 packages_apps_Settings-1f39d6a6e78d5fd0595306d1ed38a8f7ac04e3fe.zip | |
am edbada7a: am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
* commit 'edbada7acd2d40db1c472e291f3191c6f26d980a':
Accessibility no longer overrides strong encryption (Settings).
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
0 files changed, 0 insertions, 0 deletions