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