diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-17 18:51:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-17 18:51:47 +0000 |
| commit | cdc8d5ee3e993754d3f065743bee8f72efc994d7 (patch) | |
| tree | d9677e0af45d464fce39ece0a0d00ce5d4c83f7c /keystore/java/android/security/Credentials.java | |
| parent | 2a1281a25ba51ba078eaec4b309b65ec818b1f7e (diff) | |
| parent | e69e206ba9b40b23dabc5ff93167ad209123565b (diff) | |
[automerger skipped] Merge "Introduce Radio Shutdown System APIs for Mainline" am: c107c3a958 am: 684df48afc am: e69e206ba9 -s ours
am skip reason: Change-Id I26f01ea5f7cca88d1c3aeefae96ff3bf11b5138f with SHA-1 29131643f3 is in history
Change-Id: I1fa565a05dee835ec37955250f9ecf10861c61cc
Diffstat (limited to 'keystore/java/android/security/Credentials.java')
0 files changed, 0 insertions, 0 deletions