summaryrefslogtreecommitdiff
path: root/src/com/android/settings/development/FileEncryptionPreferenceController.java
diff options
context:
space:
mode:
authorDoris Ling <dling@google.com>2018-04-19 18:10:17 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-04-19 18:10:17 -0700
commit3160f1cb132f396cb4a3bdcb772f5d37cc46f751 (patch)
treec125afd3e0730b647f871e9e9c963ed0af1e23ed /src/com/android/settings/development/FileEncryptionPreferenceController.java
parent2e084e25a7c29f2adadea0d7385bb9820a17ad8c (diff)
parentbe22830fdefbd8a51df21306e4f32ab9fce9f327 (diff)
Merge "Fix Network details title not being translated." into pi-dev
am: be22830fde Change-Id: Ie2d2e0637b1357b926e22bd82372d573a6c6d06b
Diffstat (limited to 'src/com/android/settings/development/FileEncryptionPreferenceController.java')
0 files changed, 0 insertions, 0 deletions