diff options
| author | Scott Main <smain@google.com> | 2010-09-23 11:46:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 11:46:10 -0700 |
| commit | f1eab210cc9a366af537b4bc173cac7d24ab2d13 (patch) | |
| tree | b384ee75405465b41a55c0fb82ddf0b3f16b7dd1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4bca146318b7b33a5011256b0392442da38d969f (diff) | |
| parent | 53c155baf8da4e3a07c1b9898311752438ab2ec0 (diff) | |
am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
Merge commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95' into gingerbread-plus-aosp
* commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95':
docs: add more info about state list drawable and onclick attribute to Button
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions