tree 380210e89ec9b26a2b3ec2a0d7faff5a56a3f6d0
parent 7d12e548a5212a661baad0722a244373f093e837
parent 171f2e8621ff1e97eede37cd6c008720c14f93ee
author Treehugger Robot <treehugger-gerrit@google.com> 1595996056 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595996056 +0000

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

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

Change-Id: Ib06023379f7a064dce55b79488aed77956611040