| commit | 4707781c973230274d44e0669824f56bda6f484e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:19:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:19:47 2021 +0000 |
| tree | cf7613c616636436e87bd7283969efdad1f8b387 | |
| parent | 732fc3caf1b2461ead1947b1fa5018ea3f9c5605 [diff] | |
| parent | cf151c1b8be59e4f3429436fd606319baa18da6c [diff] |
[automerger skipped] Merge "Merge Android 12" am: cf151c1b8b -s ours am skip reason: Merged-In Id666e2793d42ad6028265fa340ecf4e75ed5a5b5 with SHA-1 732fc3caf1 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/1847700 Change-Id: I4b118a1267b92d4a5db2cb1c90e3ebbdef21cb0c