tree 972c4ddc8d8ef97ccddcdd80471a8b904225e805
parent 5f2bd29169c329f535dc47b8c7e5849c95ebca6c
parent 1fa2cf0f8836d5efc61d6c3930e878bca64f7478
author Makoto Onuki <omakoto@google.com> 1726687938 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1726687938 +0000

Merge "Fix resource-apk inclusion" into main am: 1fa2cf0f88

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

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