commit | d7c94f147f8f7d31fd4ac9bcca25aa045e72e06e | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 09:50:29 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:50:29 2023 +0000 |
tree | bbd5fa71b4ad76d97c0cd539a3363268c37029e8 | |
parent | 111f65886ddee60766273da16140f2cece0cba14 [diff] | |
parent | f4bb2f759086b528604a13e63b8a57427d04c71d [diff] |
[automerger skipped] Merge Android 14 am: 35561cdc95 -s ours am: 9e9c79da42 -s ours am: f4bb2f7590 -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: I55ac51e8b7a9b3f54b2043cd07bd0b7b6b09282a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>