diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-10-11 22:19:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 22:19:18 +0000 |
| commit | 1c4d686b0c50caf025661780196e2816f871f5ec (patch) | |
| tree | bfe04cb46fdd5cb5998d336c627c64c019fadfac /src/com/android/settings/development/FileEncryptionPreferenceController.java | |
| parent | dcd1c0dde116ab7222c8ff2e76292f6b430fd129 (diff) | |
| parent | 8b399b3eb74977489906c77e8a4edbac191fb224 (diff) | |
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34
am: 8b399b3eb7
Change-Id: I42b7d928abb3e1ae71f6e23ddceba969a821f639
Diffstat (limited to 'src/com/android/settings/development/FileEncryptionPreferenceController.java')
0 files changed, 0 insertions, 0 deletions