diff options
author | Julia Reynolds <juliacr@google.com> | 2017-09-21 11:33:09 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-21 11:33:09 +0000 |
commit | a639e32289c94651df872f5cf6fafdfb9c93a8b9 (patch) | |
tree | 7372eca57f01853faa6c281d61eb956a3e6bec95 /src/com/android/settings/development/FileEncryptionPreferenceController.java | |
parent | ac040e3b1fc3488155e5bb337908c491627900bc (diff) | |
parent | a25e54fdf625e9e4e2fe65b3b7ca213743091d0c (diff) |
Merge "Sometimes there's no advanced settings" into oc-mr1-dev
Diffstat (limited to 'src/com/android/settings/development/FileEncryptionPreferenceController.java')
0 files changed, 0 insertions, 0 deletions