| commit | 32b684b06b3196f7324de72e67c004c1e11e0af1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 06 09:55:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:55:17 2023 +0000 |
| tree | bbd5fa71b4ad76d97c0cd539a3363268c37029e8 | |
| parent | d7c94f147f8f7d31fd4ac9bcca25aa045e72e06e [diff] | |
| parent | 8252296117b1943a757867791c4933d8af8b4072 [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: caf06987b8 -s ours am: 17193da7c5 -s ours am: 8252296117 -s ours am skip reason: Merged-In Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b with SHA-1 1ec7b2cee6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2775839 Change-Id: I4204ad395118b6c6206a41b5806533d7314a392f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>