tree d0ba89c14707ae583b9c681eb52cc8cda629d534
parent c1c24304316b3cd3bef89169de5aeb33564e756a
parent 827d069afb297b6d96c995c03da9d4ee17e60679
author Jamie Gennis <jgennis@google.com> 1319047691 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319047691 -0700

am 827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0

* commit '827d069afb297b6d96c995c03da9d4ee17e60679':
  SurfaceTexture: free buffers when disconnect fails