tree 67e1a8f0c877098b8162dd4855ef477285bae867
parent 63cbce5226db4a063c6fc4ce9ab3da5f1887aad3
parent 06a207999c4dad637df1604f540c3d72543f5581
author Yilong Li <liyl@google.com> 1594712307 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594712307 +0000

Merge changes I7b8a2794,I42b46ee4 am: baa1b0342e am: 06a207999c

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

Change-Id: I4d809b26b974894f9854aa5f27c2dca3abd24d53