diff options
author | Igor Murashkin <iam@google.com> | 2014-03-04 22:35:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-04 22:35:04 +0000 |
commit | 8be494eb0998cc8f7f41c504c71c54856e169806 (patch) | |
tree | 78e7b066845961d50fc60a1fb5c3e99290dae93e /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 4a07dc8d2149788be96ad783c0d63339e6747587 (diff) | |
parent | 1738d4fca78b7678d09d5c8898e1f80fa63b4a6d (diff) |
am 1738d4fc: am 462fb3a8: Merge "gui: Fix return code assert in CpuConsumer_test."
* commit '1738d4fca78b7678d09d5c8898e1f80fa63b4a6d':
gui: Fix return code assert in CpuConsumer_test.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions