diff options
| author | Bill Yi <byi@google.com> | 2017-07-27 02:05:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-27 02:05:47 +0000 |
| commit | 481bdef8aebb3e5be39442ccc399951647df5a2d (patch) | |
| tree | f30a3f45cab44bab6bc76883f5f1f8c21e531dab /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 07fa454431edbc630e386c888927478b09762ee0 (diff) | |
| parent | c367c76548785ac425d7511b4d624c05b3ba79ab (diff) | |
Merge "Merge "Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours am: 6f24c015ef -s ours am: 3c1c07a9fe -s ours" into oc-dr1-dev-plus-aosp am: a9ea1f2f65 -s ours" into oc-mr1-dev-plus-aosp
am: c367c76548 -s ours
Change-Id: I75cb7807e05e7f16e4f957e9eb050f989c71a450
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions