diff options
| author | Doris Ling <dling@google.com> | 2018-06-14 17:11:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-14 17:11:54 +0000 |
| commit | ad2d1b91b69f102cd366d0cbba505e06da89c52b (patch) | |
| tree | b9f687f8d75c7d2c304db000f5d380ef795fb45c /src/com/android/settings/development/FileEncryptionPreferenceController.java | |
| parent | 2c31aa680782909aafd5306b7d0d790f5a4662f3 (diff) | |
| parent | 6776da1cadaf73d19fc859e7e19574313ee8cc2c (diff) | |
Merge "Do not turn on NFC automatically when airplane mode is off."
Diffstat (limited to 'src/com/android/settings/development/FileEncryptionPreferenceController.java')
0 files changed, 0 insertions, 0 deletions