tree 1418aa452ff3c020803ac1248aedd190ff7228ec
parent af3d1de900fb0bf9094ed5d6ed361d8c2c71a543
parent a0994de9caf0d1d72d453fe3226af99f0c8511b3
author Alistair Delva <adelva@google.com> 1614981098 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614981098 +0000

Merge remote-tracking branch 'aosp/upstream-master' into master am: a0994de9ca

Original change: https://android-review.googlesource.com/c/platform/external/virglrenderer/+/1621572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If64336268347c58b37565c62f24b9c24cc7773de