| commit | 993b2099cee5c3ad86a5fbbd29194994336187be | [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 | 418b272f4f123457611c33146a53cf5ad3abb0fb | |
| parent | df96385b9acf9ec74c62edc34ffa9c8d9dae1c03 [diff] | |
| parent | 55d3880eed3450748eb7b97281e030902ee29c2a [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