diff options
| author | Wei Huang <weih@google.com> | 2010-04-05 15:46:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-05 15:46:22 -0700 |
| commit | 04ad44a96459289f27df44b19cc43275b9eab3dc (patch) | |
| tree | ba02998adcfbe8e2fb1483d418f63704657336f5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 83e4a5c9653dcaf0c283741da2027c9a0bd25042 (diff) | |
| parent | 9d2687587d2a57412004a3d7754e6c8ea3e15d7d (diff) | |
am 6ba03118: am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo
Merge commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9' into kraken
* commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9':
bug 2542580: fix bad icon.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions