diff options
| author | Jack Palevich <jackpal@google.com> | 2009-11-09 16:11:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-09 16:11:11 -0800 |
| commit | cd4cc139dc6bb2177739baa60d67b7710ea643a1 (patch) | |
| tree | 38bb7723a160f55406b317d11afc9a1a210c15fb | |
| parent | 82a5e661c0525f355fb8db048553d8a468e447da (diff) | |
| parent | 31c187fd685201724587747ed72cc2af4f7f68a7 (diff) | |
| download | frameworks_native-cd4cc139dc6bb2177739baa60d67b7710ea643a1.zip frameworks_native-cd4cc139dc6bb2177739baa60d67b7710ea643a1.tar.gz frameworks_native-cd4cc139dc6bb2177739baa60d67b7710ea643a1.tar.bz2 | |
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.
0 files changed, 0 insertions, 0 deletions