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