diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-10-15 18:24:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:24:06 -0700 |
| commit | 03ec8722774ff879414e0026101ffc9557a8b2db (patch) | |
| tree | bdce8b555bc04e61b7fe28987fe8db44786797e0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8ac739519a5d4ae6d023e21facbd48692f1a876b (diff) | |
| parent | c255165d89ad2b874d2c1ae106a209cfe48b8679 (diff) | |
am 31e4d66a: Merge "DO NOT MERGE" into gingerbread
Merge commit '31e4d66ada01ea0714304309967a38d07bfce6c6' into gingerbread-plus-aosp
* commit '31e4d66ada01ea0714304309967a38d07bfce6c6':
DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions