diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-09 19:45:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-09 19:45:14 +0000 |
| commit | a219d887046bbdf2bddd1a8205ea0354486ad313 (patch) | |
| tree | b1f26eed01ac189406b9de56804efc94889ed014 /java/java.go | |
| parent | fb58d3aaaf80a7691bc7ea39c7c150002048c8a2 (diff) | |
| parent | b24137e0cff8566031faeaa250bae2c6000f9d58 (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: 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
Diffstat (limited to 'java/java.go')
0 files changed, 0 insertions, 0 deletions