| commit | 42b52626d076a2cc32d83aa1f756c147d51588fd | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Fri Dec 11 13:31:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 11 13:31:40 2020 +0000 |
| tree | e1fa323aee58066824df5769978a08382748750d | |
| parent | 83d75468bc6841ab34660f1f8627a891180c76e2 [diff] | |
| parent | 63f5eb4d8e8cf08a31347547fd9fc2f24546cda6 [diff] |
Merge changes from topic "revert-1522123-move_keymint-JSIHXWHLZI" am: 5b7ba3e0a0 am: 63f5eb4d8e Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1525802 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I203011b3024341c04cb931c63135ea97dfd559e5