| commit | 39e75def0b9617fcf50ab9848d22308d33db47a9 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Apr 20 13:54:25 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 20 13:54:25 2022 +0000 |
| tree | a0e0df6f45adf460a06f082d6f4791471361325c | |
| parent | 80b4f9c6c55978db93858d1a58b664d1703521b4 [diff] | |
| parent | 9931e2182d308a3a67d65505264a23399fd10772 [diff] |
[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: b4a4ead4a3 -s ours am: 69e3c6355e -s ours am: 9931e2182d -s ours am skip reason: Merged-In I1a32556cdff371138118028772b773f5e9b22c61 with SHA-1 5569b04a43 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/17805370 Change-Id: Ibf61005eafc9254942e4e0392aa915093aa16846 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>