commit | 67761ea75b85be5ce16ffe6181b5ba8e8fb5da3d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Mar 09 10:02:29 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 10:02:29 2022 +0000 |
tree | 3922500aa17f5483e54c914ea0bc475ea805e82c | |
parent | 53e31bf898fd336690b894a596e37c8b5408ac47 [diff] | |
parent | 32d40b15bfd1dd37c1f0255de76cff24afdcd40f [diff] |
[automerger skipped] Merge Android 12L am: 0e60d07f08 -s ours am: 151760829a -s ours am: 32d40b15bf -s ours am skip reason: Merged-In I530870ba88f12d1250aed3e89a049a35dc0756ee with SHA-1 e1aa5446d7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2013332 Change-Id: I60ad0b8a8201d671bdb138125b1a574fb3f93228