| commit | 81f468ac06f0cc1596c267808b2f8863ea6572ab | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Dec 10 23:49:43 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 23:49:43 2020 +0000 |
| tree | f4394bfbe39750b7bfaebf420b04b5c436513d17 | |
| parent | c1a7d9952edd6a58342a3df8ed71f702ffd28ad4 [diff] | |
| parent | 8ed82892e723f217a003efb7c151ef2a895aea77 [diff] |
Merge changes from topic "move_keymint" am: 249cdd49b6 am: 8ed82892e7 Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1522123 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia2323b7b0b1bfa6a07ddc5acedbdee3cda6147b4