| commit | 799571db495e453fd1aae7a9cd1a326da29d876a | [log] [tgz] |
|---|---|---|
| author | Jack Palevich <jackpal@google.com> | Fri Nov 06 16:45:58 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 06 16:45:58 2009 -0800 |
| tree | a686c4d9a0b3c581a5cda314cd6f782cea2b3284 | |
| parent | d6a0eebe8a4db18753fe1efca574df3af964725e [diff] | |
| parent | 8d1b6d0965c1af893e9c58c194d44968678a7909 [diff] |
am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2 Merge commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76' into eclair-mr2-plus-aosp * commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76': Fix stupid bug in GLThreadManager implementation.