OSDN Git Service

am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1
authorMathias Agopian <mathias@google.com>
Wed, 30 Nov 2011 01:48:01 +0000 (17:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Nov 2011 01:48:01 +0000 (17:48 -0800)
commit53233c52d04d20813760f655f0ec7ed28657825b
tree3d859fbffa0ef9495df1d244ac32b9e044b43105
parentb63de44c224b00e3186e8359c0a31b8d4c1e7f84
parent0c740a46d2877cedc3315e57ab967019240f5a15
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