tree e9006c2f1b21a4558fc07f5fe9ffb9fe0bb26b8e
parent 14088676e00bfe8ecb081353e9c30779d3ff6703
parent 2027fd55ba3e767fafa330716deadf4daa359909
author Xin Li <delphij@google.com> 1702332320 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702332320 +0000

[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 1804e19358 -s ours am: 2027fd55ba -s ours

am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865759

Change-Id: Ie01d71606e0e3bf598a62e2575195d1eea2a25e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>