summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-11-04 07:56:42 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2011-11-04 07:56:43 -0700
commit2009c2f06c97932f0ba70cb6aed49e3904319f18 (patch)
tree126d691334ba8d6ffd25b48654a0ee129bc3188b /opengl/tests/gl_basic/gl_basic.cpp
parentee0e44271a9c40e0a6e960f49186c4805d52ca8d (diff)
parentfd4f0cdc3abe833b16b20679582cd4be034d892a (diff)
parente8dc810f7cc6c581107c2d80586401842004d4c5 (diff)
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I81cf3b3994cb9a1c18fca3ce0049e09402543086