diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-16 05:03:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-16 05:03:07 +0000 |
| commit | c2cd943620272df736dfabc2c17cdd80753b16c7 (patch) | |
| tree | 79ba949ac60395c092787093297d9d4bae66dd04 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0a0137a9b32c7ce43eaca2c25c06412a2c22bbd1 (diff) | |
| parent | 3dd554600b696da213f143ee2e0ff4b601d3c745 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: b1b49973c5 -s ours am: 24bb35c160 -s ours am: 543659f9df -s ours am: 3dd554600b -s ours
am skip reason: subject contains skip directive
Change-Id: I3f0280f7c0ac2e0e87fbe55c87952600ad31e4ec
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions