diff options
| author | Felipe Leme <felipeal@google.com> | 2016-06-08 18:35:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 18:35:11 +0000 |
| commit | 76614b0120a2603009105ce2ce323eb57c1ce7e1 (patch) | |
| tree | 758fe71b4bd25ad4f93215f8922f03aa3ae507b3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2fc9381a2a370142b3559c6c1445588643d6ae60 (diff) | |
| parent | 12af7d51a1a0c4e98955ae58a69552b8f55904eb (diff) | |
Merge \"Explicitly sets dumpsys timeout.\" into nyc-dev
am: 12af7d51a1
Change-Id: Ieab6b2ad648ff58b3bee7ffc8d4fbc3cfb516225
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions