Cody Kesting 72e0ed49b8 Merge "resolve merge conflicts of 9e491121c5 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

2020-06-22 17:21:00 +00:00

..

cts

Merge "resolve merge conflicts of 9e491121c5 to rvc-dev-plus-aosp. Caused by aosp/1316384" into rvc-dev-plus-aosp am: 0b4f6cbacd am: f30e887ac6 am: cc1bf75970

2020-06-22 17:21:00 +00:00