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

Browse source

am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a 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>

...

This commit is contained in:

Xin Li 2023-10-06 07:56:26 +00:00 committed by Automerger Merge Worker

parent 91b0c64df5 5c7d0cfb7d

commit 0a5d8bac49

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available