From: Jamie Gennis <jgennis@google.com>
Date: Mon, 20 Aug 2012 21:37:02 +0000 (-0700)
Subject: am 9e08ee74: am f7f63450: Merge "Revert "SurfaceTexture: call ConsumerBase::freeBuffe... 
X-Git-Tag: android-x86-4.4-r1~742
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a423b460409232c6b86c72a1e4a6c99aead54486;p=android-x86%2Fframeworks-native.git

am 9e08ee74: am f7f63450: Merge "Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"" into jb-mr1-dev

* commit '9e08ee7493133e94ddd6c616e3ae36ec96a5e855':
  Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"
---

a423b460409232c6b86c72a1e4a6c99aead54486