| commit | 61fef716312842f5c18e1fc1817019a1e0af4b1f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Sep 07 02:22:17 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 07 02:22:17 2024 +0000 |
| tree | 168a6df95db132291acf4b8651a30653de76b418 | |
| parent | 8739e0aa40623fe9f32fd161b1fd2cd2937ad9ca [diff] | |
| parent | 02db29fe5e2a7fb336bbeeddb670093edde7b4bc [diff] |
[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 4abb646978 -s ours am: 02db29fe5e -s ours am skip reason: Merged-In Ifef2359252724143fcf8f57f9f36a09d71e45c2c with SHA-1 732f3ef60c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3255684 Change-Id: I1dbbdd188cd28ae83aed7b1a1a78326968438a72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>