diff options
| author | Scott Main <smain@google.com> | 2010-10-05 15:17:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 15:17:40 -0700 |
| commit | dc7921f5333bab72f37ca02a068e81441b8ad7ab (patch) | |
| tree | c7f57a471ef7a293ba101955c412b9d2376d3908 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bc16dbc810382c29c8122d060ce7c07058dca1be (diff) | |
| parent | 0f77061f389a9b86b3cc296af7ebd0f18ae1a667 (diff) | |
am fc7f3919: am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d'
* commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions