tree 0f8b2c4dee16821a6151ff66cdf7ede71e6faffa
parent e304b848fd89cfdee864b701945e0cae84cb158a
parent 02891b3ffd8e4292ace57f18f0288edeace0a17c
author Treehugger Robot <treehugger-gerrit@google.com> 1648598832 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648598832 +0000

Merge "Fix compile errors on Android R" am: 1f82b47f38 am: 02891b3ffd

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

Change-Id: I0c371ece4330a867b5717be0ac4670aefff6736d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>