| commit | 9bb155c54680a0fdfa50f24909a22c5f641a8d04 | [log] [tgz] |
|---|---|---|
| author | Kousik Kumar <kousikk@google.com> | Wed Sep 30 18:58:47 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 30 18:58:47 2020 +0000 |
| tree | 2b5928c230597ff7a18724e513bee209cea7b62b | |
| parent | 741c048849e0bdc190e8b1c070438115c6e7cb6d [diff] | |
| parent | 3552bcc5da43e026056c3169c42ec292fc4141cd [diff] |
[automerger skipped] resolve merge conflicts of bc3246481d391927f4f4f9b5da20e7c97129b9ca to rvc-dev am: 4a5db22a77 -s ours am: b845da4288 -s ours am: 3552bcc5da -s ours am skip reason: Change-Id I4d06b4fa190d6185b15aa98cb6f1a33f9702981e with SHA-1 6d3d75bbf6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/remoteexecution-client/+/12659471 Change-Id: Iebdfa1218297885ff9bd22b308cd5557ace12ac0