diff options
| author | Julia Reynolds <juliacr@google.com> | 2018-05-07 11:40:24 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-07 11:40:24 -0700 |
| commit | 02489dd9881f0a1a4aeedabbf8e707edf3caa4c4 (patch) | |
| tree | 7cc9544e8ef0d6745310c9a174ee9136f89f93e9 /src/com/android/settings/security/EncryptionStatusPreferenceController.java | |
| parent | c463f1989930c50aab93f6fe26c6b980c6740229 (diff) | |
| parent | 62491a2c826029bdee6c390139b46a4eecf8e39d (diff) | |
| download | packages_apps_Settings-02489dd9881f0a1a4aeedabbf8e707edf3caa4c4.tar.gz packages_apps_Settings-02489dd9881f0a1a4aeedabbf8e707edf3caa4c4.tar.bz2 packages_apps_Settings-02489dd9881f0a1a4aeedabbf8e707edf3caa4c4.zip | |
[automerger skipped] Merge "DO NOT MERGE DND settings redesign" into pi-dev am: e9211d58d2
am: 62491a2c82 -s ours
Change-Id: I5edc0cc8e20b3ef0693cee35cad2be74826d6d75
Diffstat (limited to 'src/com/android/settings/security/EncryptionStatusPreferenceController.java')
0 files changed, 0 insertions, 0 deletions