| commit | 8d0e14723312a9f8286ba95cc559ee000eab1b82 | [log] [tgz] |
|---|---|---|
| author | Jack Palevich <jackpal@google.com> | Mon Nov 16 19:52:12 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 16 19:52:12 2009 -0800 |
| tree | ab91d91583b668c17e1c37cf79eabfb5447fe1d0 | |
| parent | e5fa335b0dffbd06385b6de05ae04b2bd2ea277e [diff] | |
| parent | a822f02bb9c7f5bf2e3fa3cb63effc391be158c5 [diff] |
am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2 Merge commit 'a822f02bb9c7f5bf2e3fa3cb63effc391be158c5' into eclair-mr2-plus-aosp * commit 'a822f02bb9c7f5bf2e3fa3cb63effc391be158c5': More GLSurfaceView cleanup.