diff options
| author | Gilles Debunne <debunne@google.com> | 2010-10-04 14:47:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 14:47:12 -0700 |
| commit | b9a9ee37f39eb2a46d48ca410eb20d68b1d0a58f (patch) | |
| tree | 8a2ad642b3eb79903546ed32f689a47927a9a405 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f776da9ac4d8831a71ae94e6af5d15ad22a88f00 (diff) | |
| parent | 68a6951696cdaf0c95471765852fd0e70a7117b9 (diff) | |
am 33a4c772: Merge "New green in assets for battery, download, upload" into gingerbread
Merge commit '33a4c77218e4513268be8d5ce2af6f746976706b' into gingerbread-plus-aosp
* commit '33a4c77218e4513268be8d5ce2af6f746976706b':
New green in assets for battery, download, upload
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions