| commit | 72e0ed49b8cf023c80590a017ee5847f790e320e | [log] [tgz] |
|---|---|---|
| author | Cody Kesting <ckesting@google.com> | Mon Jun 22 17:21:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 22 17:21:00 2020 +0000 |
| tree | 6d997dd24be34ada12bbc7a02e16819c0dee4555 | |
| parent | e6f5ef4c2fbe8c3a6fba3298ed6f717c78db45ec [diff] | |
| parent | cc1bf7597099d16ac53ba14a8a32ad4e6d6bb922 [diff] |
Merge "resolve merge conflicts of 9e491121c5e77a11a0595d7613e5d483890b4997 to rvc-dev-plus-aosp. Caused by aosp/1316384" into rvc-dev-plus-aosp am: 0b4f6cbacd am: f30e887ac6 am: cc1bf75970 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11954340 Change-Id: I6e76e346aaa4cd44d3891a868e878ee97cd22aec