tree b1f31bb5eda932ee1b4c03227812b6f82148173f
parent ed13d6c434a8642b9a6a8bfa5655c45e402b73dd
parent c2b247d72e5d81f608aa5bb95412b8c216841f2d
author Xin Li <delphij@google.com> 1595581283 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595581283 +0000

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

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

Change-Id: I4bb66cdd17f24712fccc1fc3cdfd1a275d2df272