diff options
| author | Philipp Weiß <phweiss@google.com> | 2017-01-20 19:25:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-20 19:25:06 +0000 |
| commit | 81fda7a43170ebf5e275efb99ac766f4dac981c8 (patch) | |
| tree | 736ef7ccfcf56da1aa3562074530725e559868f3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 192ef285ea5dab8c78ded2c856283b434d7f93b0 (diff) | |
| parent | fc6771a9a6d6d5d36ffbd6be5259b2fb686147d9 (diff) | |
Merge "DO NOT MERGE Finalize device-monitoring dialog strings" into nyc-mr2-dev am: c281fd12af
am: fc6771a9a6 -s ours
Change-Id: I69d09880b997dd615faaf18089cfcc8268d68b2a
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions