diff options
| author | Rubin Xu <rubinxu@google.com> | 2016-08-23 16:09:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-23 16:09:31 +0000 |
| commit | bcd16370961104b688295f30d6526e958649f5f0 (patch) | |
| tree | 203d9d5179349393ccc21323cf6556b26a841aa3 /keystore/java/android/security/KeyChain.java | |
| parent | e815c696c03502557e35d0b5d575af3e975a8abd (diff) | |
| parent | a96e906e801d4b6280d464139a2fe61d626929e9 (diff) | |
Merge "Not longer need MANAGE_DEVICE_ADMINS permission." into nyc-mr1-dev
am: a96e906e80
Change-Id: I3bfa9c65b1ef3b79df67d58b4cb64b4bb4363d32
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions