diff options
| author | John Wang <johnwang@google.com> | 2010-01-22 10:24:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-22 10:24:27 -0800 |
| commit | a56c7bc0a9e29d42268c66efddba12bef3b27f7c (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e292f2fdbac386c56fb21f44a7fd3a69017a8ef5 (diff) | |
| parent | d5239a6f118dc5ec2c20a6f154f2ef52ddcb0b82 (diff) | |
am 36a6ec17: Merge "Update carrier display in lockscreen." into eclair
Merge commit '36a6ec17ba8dc655d0bd1d9bc92afb1699e3aafe' into eclair-plus-aosp
* commit '36a6ec17ba8dc655d0bd1d9bc92afb1699e3aafe':
Update carrier display in lockscreen.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions