| commit | cc1bf7597099d16ac53ba14a8a32ad4e6d6bb922 | [log] [tgz] |
|---|---|---|
| author | Cody Kesting <ckesting@google.com> | Mon Jun 22 17:06:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 22 17:06:28 2020 +0000 |
| tree | 0cc68b3871f84e5f5d2a9c12a2c0917c399d6af7 | |
| parent | 3673374e4115544529b4f0ed205b8626ddf082d3 [diff] | |
| parent | f30e887ac6334f66dd2fb395fe7541c16ebe0041 [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 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11954340 Change-Id: I95e4cfe2aba6d513139a73f96a7e3ca7f17715ba