tree 77b1a3ba29338f4b010d98c35fa9aa34b6e5b723
parent 3f71cfc14990e28c0de1af81933bf3f6e25c00f9
parent 9b8e1962d65589073b004889195245e757fb0e12
author Mathias Agopian <mathias@google.com> 1308010853 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1308010853 -0700

Merge changes I9b8e1962,I7bb843ca

* changes:
  Temporarily don't return the current buffer in synchronous mode
  unify SurfaceTexture and Surface