Commit 0a5d8bac authored Oct 06, 2023 by Xin Li Committed by Automerger Merge Worker Oct 06, 2023

[automerger skipped] Merge "Merge Android 14" into main am: 5c7d0cfb -s ours

am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e3347 is already in history

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

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

There are no changes