diff options
| author | Gilles Debunne <debunne@google.com> | 2010-09-29 12:20:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-29 12:20:31 -0700 |
| commit | cd6b57c915b9c3840dd2ed59cb4c6341eeff71a3 (patch) | |
| tree | 98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 10276a4b471c8d4458e52c896b6a975f0ce8b5f6 (diff) | |
| parent | e84c62a3230fe282628f2dfe826c3a868d10592a (diff) | |
am f0fa2674: Merge "New assets: wifi signal 1, no sim card." into gingerbread
Merge commit 'f0fa267492353a98562d32d4359f2099df0f2fcd' into gingerbread-plus-aosp
* commit 'f0fa267492353a98562d32d4359f2099df0f2fcd':
New assets: wifi signal 1, no sim card.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions