summaryrefslogtreecommitdiff
path: root/src/com/android/settings/development/FileEncryptionPreferenceController.java
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2017-10-04 20:53:02 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-04 20:53:02 +0000
commit6adbad6937fa9d68f022536796c89cf4e0bb08cf (patch)
treec48a393c6c1b79a1a6060103db56bc50f5d853b2 /src/com/android/settings/development/FileEncryptionPreferenceController.java
parentf110a3c3edb898a73f658a9717cb2a7c4f1f44e5 (diff)
parent9cb867d6e352d08102973611dfd552e1b5b78d63 (diff)
Merge "Use new no overlay flag instead app ops" into oc-mr1-dev
am: 9cb867d6e3 Change-Id: Iffb4b44729d42539509593590999b73763a53ab5
Diffstat (limited to 'src/com/android/settings/development/FileEncryptionPreferenceController.java')
0 files changed, 0 insertions, 0 deletions