| commit | 55d3880eed3450748eb7b97281e030902ee29c2a | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Tue Nov 29 17:48:01 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 29 17:48:01 2011 -0800 |
| tree | 235d607f7473ec35ba7db47e9fc371166f143398 | |
| parent | c040e1e77923d81050f2d3dbdac5d07e01be72f6 [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