| commit | 487e25edcba454b52354272564f75badf558d196 | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Tue Nov 29 17:48:12 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 29 17:48:12 2011 -0800 |
| tree | babf1062bf3c8f624fe8128ac19d3b85a8b5ce88 | |
| parent | c8f8263e357011d605bfa7c43d64fcc5e56cd3d4 [diff] | |
| parent | bb1e7d4324ff43491c526c77f405bbbf0cece611 [diff] |
am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1 * commit 'bb1e7d4324ff43491c526c77f405bbbf0cece611': SurfaceTexture: add EGL_KHR_fence_sync option SurfaceTexture: add a blit-to-FBO test