diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-28 21:17:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-28 21:17:07 +0000 |
| commit | 35bd6ccb8ded1cef16f31bdf1d896a4a6dc3fb19 (patch) | |
| tree | 534fed6c798b0b8fdaf82ae4558a945c06ebd621 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 887d05d5509bea82ae60e0c29e66ab7dc7738c5c (diff) | |
| parent | bff21e5c03ef4602fbdbd38566483536bc04e0fe (diff) | |
Merge "Merge "Update language to comply with Android's inclusive language guidance" am: feee9563e1 am: d5b8b0db79 am: 19847945d9 am: e17f5d1fad" into rvc-qpr-dev-plus-aosp am: bff21e5c03
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374618
Change-Id: I79b081cd59779a46af1b13df40ff41ebac1275ad
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions