| commit | 2806a6b5ffd1003e217deebb6a9c3d3c6d9d4087 | [log] [tgz] |
|---|---|---|
| author | Jack Palevich <jackpal@google.com> | Mon Nov 09 16:14:25 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 09 16:14:25 2009 -0800 |
| tree | fe4bba9c7d777cd2a4c85a54dd419b43996fdd46 | |
| parent | 7e6422c1cc9606e40332006e73542995070fb2cf [diff] | |
| parent | 73ae27f0c56fa705dcfb86d784a95b86f10e48ad [diff] |
am 73ae27f0: am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2 Merge commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad' * commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad': Allow a GLThread to release and reacquire the EGL Surface as needed.