Skip to content
Commit a510a2db authored by Kousik Kumar's avatar Kousik Kumar
Browse files

Resolve merge conflicts of "Check UseRBE is set before replacing any template... 

Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c03 am: 4e2977ee am: e78212a5

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

Bug: b/198045383
Merged-In: I6df58b4e700f0d231367af2710672d731d20a736
Change-Id: Ide5966e039ae5232438946fa064d8621088bc1ee
parents 4e88859a e78212a5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment