commit | 6518c2bab4e336a08e703018accdf7d5e6a6a1ad | [log] [tgz] |
---|---|---|
author | Jack Palevich <jackpal@google.com> | Fri Nov 06 16:56:32 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 06 16:56:32 2009 -0800 |
tree | 11d67241d53ce71bba2b30055e4e79e812ce7122 | |
parent | 790c4294da25a9d935ed9a520f9ca3d20a48790f [diff] | |
parent | e54f267f06e86f9c1248742fc56967355721a4e7 [diff] |
am e54f267f: am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2 Merge commit 'e54f267f06e86f9c1248742fc56967355721a4e7' * commit 'e54f267f06e86f9c1248742fc56967355721a4e7': Fix stupid bug in GLThreadManager implementation.