commit | 0c740a46d2877cedc3315e57ab967019240f5a15 | [log] [tgz] |
---|---|---|
author | Mathias Agopian <mathias@google.com> | Tue Nov 29 17:46:35 2011 -0800 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 29 17:46:35 2011 -0800 |
tree | 3d859fbffa0ef9495df1d244ac32b9e044b43105 | |
parent | e06a1748a48317adfb1bbe4ae4f49164cba03268 [diff] | |
parent | 86edf4f6470ee0f108bf40d3c1d23bf0a78c9c38 [diff] |
Merge changes I7e973a35,Ib3386fcc into ics-mr1 * changes: SurfaceTexture: add EGL_KHR_fence_sync option SurfaceTexture: add a blit-to-FBO test