diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-11-05 19:33:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-05 19:33:39 +0000 |
| commit | 3f95c7588b975c41dc23239cafeaad1f31b790b7 (patch) | |
| tree | 2efb6b50507926604135f863eb20c6d8090b5a54 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 50581d6585540d3319196f233e1d1085ecd31523 (diff) | |
| parent | e76a881d7827df2ab9dabe1a53fb0b29ecb8ab96 (diff) | |
am 960177ae: (-s ours) am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
* commit '960177ae394a466d765a2dc171e136f9fdea06b6':
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