diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-05-18 17:51:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-18 17:51:31 -0700 |
| commit | d8dcaa4050176de5bd3fede2064f153ed8fe8eb0 (patch) | |
| tree | 384bd709bfdad1b99e928efef531b47d16a3d8f3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e92dd5702bd2420cc52dece03e77130834c59566 (diff) | |
| parent | c1a72346bb492a270b4c8d4f614836c6145951c2 (diff) | |
am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit '582841e734bc85b247df64ac85b6ee09f7375f44':
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