diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-08-27 20:03:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-27 20:03:18 -0700 |
| commit | 36439cd4920a9c597b254915cac8a57a3c40d863 (patch) | |
| tree | 3da1d8d0a16d08bae8a68c1b9a23cd5a4a40992c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cb9a157689bfbbadf2d67aef3769a78e24c69262 (diff) | |
| parent | 158d8968439cd0a11c952d32879a1518c0f8fb3f (diff) | |
am 554d8726: (-s ours) am 0776deff: More obsolete status bar bits. DO NOT MERGE
Merge commit '554d8726f8df053c07e0c68e43f060019c11264e'
* commit '554d8726f8df053c07e0c68e43f060019c11264e':
More obsolete status bar bits. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions