diff options
| author | Wei Huang <weih@google.com> | 2010-04-10 11:47:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:47:51 -0700 |
| commit | 6d43712cbf7d4101af45c7be1fee329bbbe94fe1 (patch) | |
| tree | c4333b1d19b4dea3beb4fd5c98a3afcd88572544 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5dda520f80fd9ad042724f1c692c938b49964375 (diff) | |
| parent | d52d0b0550344cbe67d3f315c2e1305e2c129cbe (diff) | |
am 997b3803: am c621b65d: Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo
Merge commit '997b38036f5ac5db69191d090c8c3c1d1b05aace' into kraken
* commit '997b38036f5ac5db69191d090c8c3c1d1b05aace':
bug #2542580: add the appropriate mdpi asset for chat icon.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions