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-02 10:52:48 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2011-11-02 10:52:49 -0700
commitd4460f97332508a096100c54d1ce11d08a84af69 (patch)
tree0394c445c27c2dde78ef2b06bb4d4a30a3ae4ce4 /opengl/tests/gl_basic/gl_basic.cpp
parenta26f7fab723bed79390aa8cb1913272bc9ce585f (diff)
parentf34412f489d333e7cf58e89d9cc6d8fbe8d2670c (diff)
parent7e3626866f47105eac71d400d3c655a338659194 (diff)
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001