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-07 08:22:56 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2011-11-07 08:22:56 -0800
commit2642a74b9943069b8d4182dbec8f7681c6f0ae13 (patch)
tree819b82d38d9ee5b6510adca31f7a69d42d981b85 /opengl/tests/gl_basic/gl_basic.cpp
parent1f0509b675fd2b3229ec0be99687441ddd42922c (diff)
parent0689c381b779dd323dbd175cdfe333fc250230a6 (diff)
parent06234b37e3bfb910e7be9b4fdb035c958983a2ae (diff)
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2