[automerger skipped] Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c
am: 4e2977ee81
am: e78212a55c
am: a510a2db10
am: b24137e0cf
-s ours
am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183
Change-Id: I8e61011963f661e219b5f4587c777423d2265865
This commit is contained in:
commit
a219d88704