| commit | cc68de42adf0f828a68e78b1fbd2734db9af8288 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jun 15 21:58:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 15 21:58:04 2020 +0000 |
| tree | 1d48c0984be65825152a0f184d2a7e929615287c | |
| parent | 8b07653d326b77e8104c8547fbdd44b75e39c4fd [diff] | |
| parent | ba1763e16bfe7fbc6155f982e07511b984bebf35 [diff] |
Merge "Add DEVICE_LOCKED to the AndroidKeymasterCommand enum." am: 032480f59d am: ba1763e16b Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1326396 Change-Id: I6855042ec270398f9e8584f9c7e5ddb6e93c3dfd