summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-28 21:16:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-28 21:16:14 +0000
commit887d05d5509bea82ae60e0c29e66ab7dc7738c5c (patch)
tree1a6d14b7ad057a82c8035c0f9029cf5c9352ecc2 /opengl/tests/gl_basic/gl_basic.cpp
parent2fabbc0a876c597d4c542ba10fc003f67b045c1c (diff)
parent55e6b727730de092f46d2fda4d96ed37feccb6ff (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 2a5f9dcd16 -s ours"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions