diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-16 05:37:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-16 05:37:08 +0000 |
| commit | 3a1fb5ee55754ff6cd81a83935dbb65b778c2142 (patch) | |
| tree | 79ba949ac60395c092787093297d9d4bae66dd04 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 01c614605f7114d10a8761ca41ec40e725c2db4c (diff) | |
| parent | 7802c4d28d0cd0fb3cc6e1500849f2940e60ecf8 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0f05db89c3 -s ours am: 5b04790e16 -s ours am: f4482d494a -s ours am: 7802c4d28d -s ours
am skip reason: subject contains skip directive
Change-Id: Ie9582d87462b48817e9a7ba45788f7764f48fdfb
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions