OSDN Git Service

am 3eb49879: am 729f4808: Merge "Revert "SurfaceTexture: inherit from ConsumerBase...
authorJamie Gennis <jgennis@google.com>
Mon, 20 Aug 2012 21:37:03 +0000 (14:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Aug 2012 21:37:03 +0000 (14:37 -0700)
commitb1d446fe621cfeaaa76a8892b1c99cb73d093d9c
tree38a6cad02a3535162c06cc3642866090a4e9ce41
parenta423b460409232c6b86c72a1e4a6c99aead54486
parent3eb49879918a54f090ec9252d7d3072dd4d31e94
am 3eb49879: am 729f4808: Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev

* commit '3eb49879918a54f090ec9252d7d3072dd4d31e94':
  Revert "SurfaceTexture: inherit from ConsumerBase"