tree bbd1d50240223808980077a630c696684c271703
parent 656e20a2ede0fd52fe3e992a01e22633e8470a0d
parent 7bd81fc2ed6a66858c852e364d59cb907c4d8516
author Xin Li <delphij@google.com> 1595580371 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595580371 +0000

Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482 am: 7bd81fc2ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12203486

Change-Id: Ifcbae9348b4b946dee3f1c16eb7598273673c623