diff options
| author | Wei Huang <weih@google.com> | 2010-04-22 16:41:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-22 16:41:17 -0700 |
| commit | 7b956cc02ce1b4ea918fabb70b76b637ebbbcf84 (patch) | |
| tree | 0647a68e25a4a6329cc0572a75dee37b8fd3dc19 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a4a0502342d1139270ebe266dff401ef70ea8844 (diff) | |
| parent | 6ece8383ecdbfe5d1cea34a161359b360fb511c3 (diff) | |
am 9666bbdf: am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
Merge commit '9666bbdf1bb96dbf42b88443ad042e63971bfb4a' into kraken
* commit '9666bbdf1bb96dbf42b88443ad042e63971bfb4a':
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