summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-05-18 17:43:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-18 17:43:27 -0700
commitc1a72346bb492a270b4c8d4f614836c6145951c2 (patch)
tree1f465c937ea4ed997c1a9048c3d9c9fe3bf79276 /opengl/tests/gl_basic/gl_basic.cpp
parentebc9266940625726035c1e89a73061268213cc91 (diff)
parent04a238006c4a3a153d58d237abc4a11ad7999f30 (diff)
am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit 'b18e700cb9c1d7090904449fc6878b8eae1d4693': LayoutLib: support the new baseline/margin query API.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions