diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-24 10:15:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 10:15:51 -0700 |
| commit | e83f259acfd7738500d0b6191af0382d25227b63 (patch) | |
| tree | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 87e80d759e8f90386d0c6bf15feae802169ca33c (diff) | |
| parent | d86edf589d0d27c2ad62f031dfec20d104968903 (diff) | |
am 5a14271a: am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread
Merge commit '5a14271aacb932ba0d52978c939f74e4c685f7d6'
* commit '5a14271aacb932ba0d52978c939f74e4c685f7d6':
Load bitmaps in the correct format.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions