tree d19189f1aed7694e092a8ba3fc39b9aa1181f16d
parent edab8c8a50ec6e5ee954a00f3e4c5391ff2898b3
parent bdbcecf1ea581dc898ba78a10882a1cf5c5b0267
author Xin Li <delphij@google.com> 1598996827 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598996827 +0000

[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 77065af37d -s ours am: bdbcecf1ea -s ours

am skip reason: Change-Id Id9ba142af9d2da12bda66d0c376d4b8c13f1503b with SHA-1 18345a4cc9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12484813

Change-Id: Ie34e9c3f8cd25bc1a2ae0579c6fa8d831a982c76