diff options
| author | Bill Yi <byi@google.com> | 2017-08-16 21:00:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-16 21:00:28 +0000 |
| commit | a8d17297aa7cd267c7f82494286258964a3f54f1 (patch) | |
| tree | 30921715fa259014876de4cbefe3d241176a1770 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a4e586511b5ed2e4962bf55ba4ae1be5e9122d67 (diff) | |
| parent | 2dc7e093b4003294aacc9465922c32951ab02124 (diff) | |
Merge "Revert "Import translations. DO NOT MERGE"" into oc-dr1-dev
am: 2dc7e093b4 -s ours
Change-Id: Id58c84e6a2df255b7c22b5f1bfdadc4d7dff2091
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions