diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-02-07 10:22:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-07 10:22:32 -0800 |
| commit | 35081eaf6e0bf4355934dda90b447f7ed974de27 (patch) | |
| tree | ea8394774dd2af9d10699c0198d5639d47f212a6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 711aec45349d5d8708e44dbf8cf04be2adb5daf9 (diff) | |
| parent | 24719f459bbbfa946db946133c294e49ed3c42c9 (diff) | |
am 62a99c0b: Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb
* commit '62a99c0b3bca70262ab205a5688ff69cbbbaee78':
LayoutLib: Handle color state list in methods returning an int.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions