tree e4371a119e8b61881cc51861fa8f5f2e23f78054
parent b676e3e52f257a1b3a3aff21153ee46ae3e148ba
parent aa8518fad38a2bfc887e85ec6ff1cb373f635e53
author Treehugger Robot <treehugger-gerrit@google.com> 1680567038 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1680567038 +0000

[automerger skipped] Merge changes from topic "fdo_profile" am: 43a2a9a5c6 am: e85290a035 -s ours am: aa8518fad3 -s ours

am skip reason: Merged-In Ia14679285b92f3f14ff269392a61f978c71311b2 with SHA-1 611f036669 is already in history

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

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