diff options
| author | Gilles Debunne <debunne@google.com> | 2010-09-27 21:02:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 21:02:41 -0700 |
| commit | 126f463bd5a9497fa7d0cec626926bfe560ab4fa (patch) | |
| tree | 355bbde30004c085072c85fa7f9e54c1710673b1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cb3459e248ae1df8f74b89578b1f4321f3fec6ad (diff) | |
| parent | 10082c6cad2f691281468845a102a615026e8628 (diff) | |
am 63555e36: (-s ours) am 0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
Merge commit '63555e36c9dd9b38624ae275ffc3f598a5112057'
* commit '63555e36c9dd9b38624ae275ffc3f598a5112057':
Revert previous status bar assets. DO NOT MERGE.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions