summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-02-06 16:46:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-06 16:46:46 -0800
commite1ce916e0029d72ddbf7476efd4993c7301ec784 (patch)
treeeab76adc08a6e4c7200dab116b01abe0b6086405 /opengl/tests/gl_basic/gl_basic.cpp
parentc10cd4a6e3021010786c1dbd69ab4e03ecb689e6 (diff)
parentc9bcd33afa5c34e0a49955c30aa875ac8205b65f (diff)
am c9bcd33a: (-s ours) am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit 'c9bcd33afa5c34e0a49955c30aa875ac8205b65f': Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions