diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-06 18:08:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-06 18:08:32 -0700 |
| commit | 9bbc6b05286b8a64c99dc82fa1b61da6a99c8255 (patch) | |
| tree | c790c5fc8fa491fd5310bfe40fd410317fc45515 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 445abdcf8d46d1f09e6a69277471a5d07c125440 (diff) | |
| parent | ff4e02a89764d6f68f868b115e2631641f48913e (diff) | |
am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
* commit 'ee1b497648a0c3c03b09c4739619f23315d491fb':
Cherrypick 5b61ea6b from hc-mr1
LayoutLib: enable the LAYOUT_ONLY capability.
Merge dba35f1b from honeycomb-mr1. do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions