| commit | 7b8cdcb82ef93c9f784ec57ec3dd1989da50dbf6 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 11 08:46:41 2019 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 11 08:46:41 2019 +0000 |
| tree | ae6fe16e6f8ad65c514276d850063563feea538c | |
| parent | 536461d67aca916c93c55da989f33a5e590aec9c [diff] | |
| parent | cef3fc9687d52c586fcad7abcd2f0ebdf46851fc [diff] |
[automerger skipped] Merge "Add rollback resistance support to keymaster impl." am: 26b3eac654 am: 0f5537d508 am: cef3fc9687 -s ours am skip reason: Change-Id I06736e9bf74f4aa6f518773a60f50bbca50875bc with SHA-1 bdef2923ed is in history Change-Id: If8d28954b60b8f12b7c50603ac312c63f93f2f50