diff options
| author | Adam Powell <adamp@google.com> | 2010-10-25 12:07:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-25 12:07:51 -0700 |
| commit | 0b3b01a6098ec4d1353d7ade49360ffe4e1a3f88 (patch) | |
| tree | 9b206f1df497facef94e01a850cc3c1ac8f12f8b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e1da11ce8c7abe0c966ad6a8338dcc5f098c6217 (diff) | |
| parent | 6ec561d0d919edd0abe58440a0fac2b7a028802a (diff) | |
am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp
* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
DO NOT MERGE Fix bug 3124899 - timeout in CTS test
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions