diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-11-04 21:01:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-04 21:01:40 +0000 |
| commit | e76a881d7827df2ab9dabe1a53fb0b29ecb8ab96 (patch) | |
| tree | 126d691334ba8d6ffd25b48654a0ee129bc3188b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f11ecc7c72f650232e8e0a5ca638973e3933fb09 (diff) | |
| parent | d0af48a2a4d5b0296bdc32cfd62066bbc0f4e64a (diff) | |
am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
* commit 'ca25016775391bf71f7503aeb61798df46fa54cf':
DO NOT MERGE. Integrate: Include showmap output in bug report.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions