| commit | 074000ec27dd8a75f0cc6e05833ce8b58146bb56 | [log] [tgz] |
|---|---|---|
| author | Kousik Kumar <kousikk@google.com> | Thu Sep 09 19:45:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 09 19:45:42 2021 +0000 |
| tree | b1f26eed01ac189406b9de56804efc94889ed014 | |
| parent | a219d887046bbdf2bddd1a8205ea0354486ad313 [diff] | |
| parent | 274c905be61b47f86f6e64993942263f74ba0adb [diff] |
[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: 274c905be6 -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: I3eb0185606e171767f27b083e8f8099bbee3bc7d