diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-24 16:52:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-24 16:52:54 +0000 |
| commit | 41bf42a1c73d762856d5a38d7548cf751ae8bd15 (patch) | |
| tree | c2260e3717f0d04b6c8d10839a0533641c3f8385 /keystore/java/android/security/KeyChain.java | |
| parent | 9226516cef7e4999dd339678ce32dea8a000046d (diff) | |
| parent | 51de96af1a4678b035f964747a82f9891821aee1 (diff) | |
Merge "Whitelist PHONE_STATE to wakeup apps" into oc-dev
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions