tree 22247de7bacb46ac3c093962196dedf9e2f6a191
parent 04728790fafaed7a2c75daf0b95d71c359c2dc1e
parent cf7622ccd6ebf944e2c4291be7d97c7c55a49e05
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579738849 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579738849 +0000

Merge "misc drm@1.2 vts fixes" am: 1d85278536 am: cf7622ccd6

Change-Id: I39bf388c5470e318876eff9097b7155ec3568b56