summaryrefslogtreecommitdiff
path: root/src/com/android/settings/development/FileEncryptionPreferenceController.java
diff options
context:
space:
mode:
authorsongkailun <songkailun@xiaomi.com>2017-09-29 14:46:23 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-29 14:46:23 +0000
commit109d0bafd4bf8f01bfff9325c44af05138924d04 (patch)
tree20d6d17da163981f448f9c3816db5235ee3c6030 /src/com/android/settings/development/FileEncryptionPreferenceController.java
parent17b5110539545e6eb751ccefc9a96cd720da1632 (diff)
parent39ddac51b639752b71b8b2ed45f6d7c4f6890137 (diff)
Merge "Fix wrong format in AndroidManifest.xml" am: de795d12d1
am: 39ddac51b6 Change-Id: Ife3991761d4fcbf5cecdb6745536f9ed99069a2e
Diffstat (limited to 'src/com/android/settings/development/FileEncryptionPreferenceController.java')
0 files changed, 0 insertions, 0 deletions