summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-05-18 17:40:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-18 17:40:08 -0700
commit04a238006c4a3a153d58d237abc4a11ad7999f30 (patch)
tree1f465c937ea4ed997c1a9048c3d9c9fe3bf79276 /opengl/tests/gl_basic/gl_basic.cpp
parent502019a5df0ba67c695335918f6441fd0395ad74 (diff)
parent8b836da4770f04cda00b77b9a751f27cf4f68818 (diff)
am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit 'aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0': 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