diff options
| author | Wei Huang <weih@google.com> | 2010-04-22 16:35:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-22 16:35:56 -0700 |
| commit | 6ece8383ecdbfe5d1cea34a161359b360fb511c3 (patch) | |
| tree | 532df9facad6571445d85a65fb59ba0580ea5050 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c1353e2873a9d07113906e88496964fb59091740 (diff) | |
| parent | 411b51f1f1553a0c413376a4e947f7a4f065fb8a (diff) | |
am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
Merge commit '7b88af679a9a3b5737343bb996ef392b76d19e73' into froyo-plus-aosp
* commit '7b88af679a9a3b5737343bb996ef392b76d19e73':
bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions