diff options
| author | Gilles Debunne <debunne@google.com> | 2010-09-27 21:03:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 21:03:40 -0700 |
| commit | 9a9ec419611d577c3e60e94675998c94bd96bd6e (patch) | |
| tree | 355bbde30004c085072c85fa7f9e54c1710673b1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | abba28ff35b1f3e11b0e88784aa9bedc9b18b609 (diff) | |
| parent | 46fc90c68034aae0769f80623523877696300c13 (diff) | |
am 4e9243d5: (-s ours) am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Merge commit '4e9243d55ce183542c74550e503ea583643599a0'
* commit '4e9243d55ce183542c74550e503ea583643599a0':
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