| commit | e54f267f06e86f9c1248742fc56967355721a4e7 | [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 | 5c9afbd9db7305b1e2435e0d97a67b9e9ba8bf7e | |
| parent | a3c90d930ebabcfffd9d4d7715ad1329e1f8c2d8 [diff] | |
| parent | a3a351e5d164d0c8b461ae7af86edc0227654a76 [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.