summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-05-19 08:58:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-19 08:58:18 -0700
commit85f059a82dadfd8aee3476c409765bff5672cd1f (patch)
treea682011d320462a7c841ea4260b587dd21a01d57 /opengl/tests/gl_basic/gl_basic.cpp
parentaeae5d43c8d5bd98150d4244baa510915482dfc8 (diff)
parentd8dcaa4050176de5bd3fede2064f153ed8fe8eb0 (diff)
am a13462a9: am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit 'a13462a947e634a6893119146a7271369e509586': 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