summaryrefslogtreecommitdiff
path: root/src/com/android/settings/development/FileEncryptionPreferenceController.java
diff options
context:
space:
mode:
authorDaniel Nishi <dhnishi@google.com>2017-10-15 04:30:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-15 04:30:40 +0000
commitab80b6ee9cc84838ea8843dd24da4808bb79ee44 (patch)
treea5dcc85eabf4614e4d1d2bfe146ca4a558faf6f4 /src/com/android/settings/development/FileEncryptionPreferenceController.java
parent15d06244d317430580bbea25e1ddf51dbbb5cbd1 (diff)
parentf1dc9e65f14d1f9373cdfae8665bb4cbcc2af6ff (diff)
Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7 am: 5973d32c77
am: f1dc9e65f1 Change-Id: Ib55d4b211b48f4a6e18034f60d91f43748aebe89
Diffstat (limited to 'src/com/android/settings/development/FileEncryptionPreferenceController.java')
0 files changed, 0 insertions, 0 deletions