commit | 1511cb5c728e5cf76fa5b7ef325e6c07e0dbae36 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Mar 07 10:46:57 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 07 10:46:57 2024 +0000 |
tree | eda9260df370c61e5501188e701318189a9864c9 | |
parent | 131aa921e4c30dc0ef04e36adc92004c89866ba5 [diff] | |
parent | 1564ac5348c760922353eb0283c0cf4592992fc4 [diff] |
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 2ce41c8f4d -s ours am: 1564ac5348 -s ours am skip reason: Merged-In I3acad682b4cf6c6ad9bcb2ce91d845b21a9f133a with SHA-1 a04310d7b5 is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/2990855 Change-Id: Iae1ff87a1e78509de398136e62c988b2033e9240 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>