| commit | 73ae27f0c56fa705dcfb86d784a95b86f10e48ad | [log] [tgz] |
|---|---|---|
| author | Jack Palevich <jackpal@google.com> | Mon Nov 09 16:11:11 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 09 16:11:11 2009 -0800 |
| tree | 544814ea82e94aee5e5f552240c20fc9fddefffb | |
| parent | 6720bb8314600a2b55a18159b4a22dc4b18aec88 [diff] | |
| parent | 8da3ac92a6a6247ef06de4d4b684f8635d8fc003 [diff] |
am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2 Merge commit '8da3ac92a6a6247ef06de4d4b684f8635d8fc003' into eclair-mr2-plus-aosp * commit '8da3ac92a6a6247ef06de4d4b684f8635d8fc003': Allow a GLThread to release and reacquire the EGL Surface as needed.