tree 763332b6febdd59dc045cdb2496a8d9249217d52
parent 8050014f962903c44ca617fcfb99a9f367738ad9
parent b5bd9f414299b491b5d7d24aa23f19fdc191dfc0
author Treehugger Robot <treehugger-gerrit@google.com> 1599180588 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599180588 +0000

Merge changes I4665c1fb,I3d9b8dd9 am: b5bd9f4142

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/1419710

Change-Id: I59b39abea365e8c79e3f50cc079b315a31e45986