| commit | bd01df2a8b2199d3ca62e10264ca03ac26261bee | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:41 2021 +0000 |
| tree | 7a6ccf14e7ecc9cf63c6edeb638232bb09879ed5 | |
| parent | 9b698ef3022e243cbacb6b4e7e8644cfe5432f2b [diff] | |
| parent | 1f23a87682190ac2b1840f1916b2a9e33a526597 [diff] |
[automerger skipped] Merge Android 12 am: 44b81d9d29 -s ours am: 1f23a87682 -s ours am skip reason: Merged-In I5b235cdf4ae9572bb3768d75bd58e5a7dd9967e6 with SHA-1 95a4d52a4b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1847735 Change-Id: Icbae66f441b726df6068d57e426bcfd6c891d623