diff options
| author | Jeff Hamilton <jham@android.com> | 2010-10-25 14:49:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-25 14:49:07 -0700 |
| commit | 6c51bba99b17dcda7cb8b2ad339c2999b8767079 (patch) | |
| tree | 4ca64e6705104fcfb33576e9aa815f1a29a55c17 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | aa4a1546de6d67c22e8cb75f91ffb6ccc4d72968 (diff) | |
| parent | 0da22df98ee2c49b77d9e1b7fa58ecab19801e14 (diff) | |
am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread
Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp
* commit '106165b5102be226eb8049d2f7f62d7e26034e8a':
Add a RHS status bar slot for NFC.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions