diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-16 05:37:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-16 05:37:19 +0000 |
| commit | 7cdad5fd5b1d4f1b242a37e4542e83519d206808 (patch) | |
| tree | 79ba949ac60395c092787093297d9d4bae66dd04 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3a1fb5ee55754ff6cd81a83935dbb65b778c2142 (diff) | |
| parent | a0e611d655be90fd083ca5e6628f688fcf26d89b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0735b26fdd -s ours am: ff6b9350ff -s ours am: c5b08046d7 -s ours am: a0e611d655 -s ours
am skip reason: subject contains skip directive
Change-Id: I9b6a9b8b6e0f7437a1a93416fec4ffa808e38b54
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions