| commit | a4fbecd1198899a3a4e55795406a06e7c111b13e | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Wed Nov 30 10:50:52 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 30 10:50:52 2011 -0800 |
| tree | 2c7c7d491a3baf34446824d029b838ba7f76a3cb | |
| parent | 27d22dc8625d4ccc2304a125de320f7ac49e2552 [diff] | |
| parent | 53233c52d04d20813760f655f0ec7ed28657825b [diff] |
am 55d3880e: am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1 * commit '55d3880eed3450748eb7b97281e030902ee29c2a': SurfaceTexture: add EGL_KHR_fence_sync option SurfaceTexture: add a blit-to-FBO test