diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-09 19:17:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-09 19:17:37 +0000 |
| commit | b24137e0cff8566031faeaa250bae2c6000f9d58 (patch) | |
| tree | 83152d55e65a92177185e23c18c82ce8d08ccb72 /java/java.go | |
| parent | 51c318f4039e1e1a9a48364ce6387293ceb699ac (diff) | |
| parent | a510a2db107e15b7f413f3ee6e7d4fe8a70e7a55 (diff) | |
Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183
Change-Id: Ie310a0529d5c3c90f5dba61ddc736edd4569ee13
Diffstat (limited to 'java/java.go')
0 files changed, 0 insertions, 0 deletions