summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2011-06-14 15:02:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-14 15:02:25 -0700
commite6b686f49795999b9a2932efd0697c97ac080a62 (patch)
tree01e09e2a5586c79999831795bce23b509374fcce /opengl/tests/gl_basic/gl_basic.cpp
parent545478bf15a260ac682101d681fe86da3208abeb (diff)
parentb3c02f97a84b1b7ecc32fa97c7eeb46a60f1e644 (diff)
am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '4cd4c82073a6066bb94cce089cd259d19969c0fd': cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions