tree 08237c5cdc51537ab4b99c92395e78ad97142a78
parent 7df16644c4e5fbb30d011b9098d9c8833f89f0aa
parent d4e706208c99ff1716fb0009ec867ff29ff04a7c
author Jamie Gennis <jgennis@google.com> 1354907223 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354907223 -0800

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

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