| commit | d25c1597cdbbdb51bca83145dafd2c5a647c07bf | [log] [tgz] |
|---|---|---|
| author | Eran Messeri <eranm@google.com> | Mon Dec 05 18:12:07 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 05 18:12:07 2022 +0000 |
| tree | 7cf35a2a938b351dd0f68f614b9a27ec36b36ea5 | |
| parent | 4bbf37bdb075bbdcfe90d3c19664e2b274c38b76 [diff] | |
| parent | 55ed2218db5900eb1e40337b5948e606f92e2e29 [diff] |
Merge "Support 2nd IMEI and bump KeyMint version to 3" am: 7deaccfd13 am: 55ed2218db Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2294717 Change-Id: I5e36381eb9a207a492286ffe2c792f246db6cf00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>