tree bbd1d50240223808980077a630c696684c271703
parent 74bf4afe3ca194e9c12ce9472311042171e261d4
parent cc2381c482e58394cb51ad25c8406ffa98306eb5
author Xin Li <delphij@google.com> 1595579209 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595579209 +0000

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

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

Change-Id: Ife68d336b5f8c65f36daf8aa1d9521adb13d406f