tree 9a583394a88ec891644731ce534988e179164aad
parent fdd71ba2378c40aa37177708ea2eede524475cee
parent 45f145093a1b1bf3ec7f94fdca3691069b903643
author Treehugger Robot <treehugger-gerrit@google.com> 1595997159 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595997159 +0000

Merge "OpenGL: Use more inclusive terms" am: 303d4ecdad am: 4464572a00 am: 302b6f8f50 am: 171f2e8621 am: 45f145093a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1374795

Change-Id: I4699eec711e458ea2b3381040f71027f1deb4939