diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-16 05:35:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-16 05:35:59 +0000 |
| commit | 01c614605f7114d10a8761ca41ec40e725c2db4c (patch) | |
| tree | 79ba949ac60395c092787093297d9d4bae66dd04 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c2cd943620272df736dfabc2c17cdd80753b16c7 (diff) | |
| parent | 04bf3f2b390bc77d49ebf38791c635fa1a924040 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65e9e82b3e -s ours am: 784cb61c9b -s ours am: 6b0fb058c7 -s ours am: 04bf3f2b39 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia99095e37f90ced184ecf6a8aa6eceeb552dd669
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions