diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-21 18:14:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-21 18:14:09 -0700 |
| commit | 01facd0ad0a981fab02e246acb028ce6f2cb9144 (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6e0035ceb3d976d3193fdf8e7421d3ab6cb733a6 (diff) | |
| parent | df2d7283d926cd1897ff7c615d6baa5490d2220a (diff) | |
am 4f87a46e: am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1
* commit '4f87a46e6f1a8ba601a320c902abc3d5ce010674':
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