| commit | c7600e1b1c135955f373ae2c97bd22e6aad91f9a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Mar 09 10:05:26 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 10:05:26 2022 +0000 |
| tree | 3922500aa17f5483e54c914ea0bc475ea805e82c | |
| parent | 67761ea75b85be5ce16ffe6181b5ba8e8fb5da3d [diff] | |
| parent | 94e5cff3c36bbef56c01a83d8e2af5f3d3560958 [diff] |
[automerger skipped] Merge "Merge Android 12L" am: d048a43d5d -s ours am: a8ba5846f9 -s ours am: 94e5cff3c3 -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: I609fdd417dedc45d9a5be2ff0abd8eaf6ae769d1