diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-16 06:07:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-16 06:07:04 +0000 |
| commit | fea5dbe9c33e10b62d889b3eca356b8d42d1d816 (patch) | |
| tree | 79ba949ac60395c092787093297d9d4bae66dd04 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7cdad5fd5b1d4f1b242a37e4542e83519d206808 (diff) | |
| parent | 7d01c8cbcdbe665e6b6ecee3f961b0b46b6a23a2 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: e7f3897b6a -s ours am: effc2bdd8c -s ours am: dfbbda6d98 -s ours am: 7d01c8cbcd -s ours
am skip reason: subject contains skip directive
Change-Id: Ib38756b3823a416d2348f6eb7b57762ee5ce789a
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions