summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2012-02-16 07:34:05 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-16 07:34:05 -0800
commit8852d0b4667dbf3c9ea7cdb06be4d77227130167 (patch)
treeff01477a7761363ff70eee6506138284a0546950 /opengl/tests/gl_basic/gl_basic.cpp
parent9e07cd8d326ffd9ab9af274010c143a806234c6f (diff)
parenta55f071f3ae1dab3d522fc5a5c35bfa9c7fe6a01 (diff)
am 23f278fc: am 84d8eed0: am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
* commit '23f278fc96bdab8bab606a47706132a31985c202':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions