diff options
| author | Gilles Debunne <debunne@google.com> | 2010-09-27 16:17:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 16:17:28 -0700 |
| commit | 46fc90c68034aae0769f80623523877696300c13 (patch) | |
| tree | f1f0e7831502036b3e854a76778f8c6ae8d6def6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1fcf429f153a8cc55e9fd912da1a789dc2b00551 (diff) | |
| parent | eec02f9bad039bf80e014a489362fa5060a399ec (diff) | |
am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Merge commit '8d7057df401af668335c38273bc62872e4dbf538' into gingerbread-plus-aosp
* commit '8d7057df401af668335c38273bc62872e4dbf538':
Updated assets in status bar. DO NOT MERGE.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions