summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2011-11-17 10:02:16 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-17 10:02:16 -0800
commit664bb774f528fead63d7c0e62b533da66390b246 (patch)
tree57dd91073be88c776f15a5530da28625b5b52bd3 /opengl/tests/gl_basic/gl_basic.cpp
parenta8f7b7c4794d62df4b3cec67dee1a9887afb53a4 (diff)
parentaefc0ed9677233d5e8c991196f970222b4899dc3 (diff)
am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1
* commit 'aefc0ed9677233d5e8c991196f970222b4899dc3': Don't upgrade some settings from GB to ICS.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions