diff options
| author | Scott Main <smain@google.com> | 2010-07-28 14:27:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 14:27:13 -0700 |
| commit | 5cde867d20f66c10a16b1908ce9c677beec7eeaa (patch) | |
| tree | dcc4d4d6a93ef10e3f11946f8877e0b646eaf327 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7be99a70f9e27e31c636d70b84f63c0ed183aec1 (diff) | |
| parent | 7d3bc349d9b4edf0151d36d44669374422a797f2 (diff) | |
am b1bb7180: am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo
Merge commit 'b1bb7180ec3446208ea717d96f6a507ea9955a13' into gingerbread-plus-aosp
* commit 'b1bb7180ec3446208ea717d96f6a507ea9955a13':
fix markup error
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions