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