summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-24 18:17:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-24 18:17:09 -0700
commit051183aeab504e07bad824ec06bb4fbbdddd96f3 (patch)
tree3d7a6ea3e640e88684325b18b52731badb53d295 /opengl/tests/gl_basic/gl_basic.cpp
parent29bb63fbe5dd48cdc3e4408ab7fa7900adbe53a0 (diff)
parent365d9864878fb3767c2850093ed31fd2346d2e99 (diff)
am d335f9a9: am bb0eb5ca: Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread
Merge commit 'd335f9a90375db18b2f77f22f62379ac2d257384' * commit 'd335f9a90375db18b2f77f22f62379ac2d257384': Negatively cache settings and proactively slurp settings into cache.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions