diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-21 18:00:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-21 18:00:30 -0700 |
| commit | df2d7283d926cd1897ff7c615d6baa5490d2220a (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6c75f56b1cc6069ee8174b9995b521f101212f1f (diff) | |
| parent | 838c9844f7a5566467305f732fac730738e0758d (diff) | |
am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1
* commit '7abedd0cdefdcd6d3b62808724e721bb1b92b185':
do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions