summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDave Santoro <dsantoro@google.com>2011-11-17 12:27:44 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-17 12:27:44 -0800
commit60e345a9a95a0f24804f729eeb5216012d1bcbac (patch)
treec4af6410ae6a04e04cd978ca74f6b8e9b68497ff /opengl/tests/gl_basic/gl_basic.cpp
parent5397bb52fba04e8dc8496d731611210213847308 (diff)
parent9be4962060ca67c4fe9bfc391043f6d2829cf720 (diff)
am 9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '9be4962060ca67c4fe9bfc391043f6d2829cf720': Unhide social stream permissions.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions