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