tree f0d1b201b52ead22b6e1791d5ed375f6357cb9a1
parent 2d659286b59dc7ff7378fe967f1c425e92155995
parent 72c3f7d88160b7c279f90f0efe3c1cb12cd140ae
author Jamie Gennis <jgennis@google.com> 1354907091 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354907091 -0800

am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"

* commit '72c3f7d88160b7c279f90f0efe3c1cb12cd140ae':
  Revert "ConsumerBase: free buffers outside the lock"