tree d133f02fff5942f78e51d81398fc4e23c2f2ab89
parent 514c8ffc36b3e93d9ffa61328149ae47ef749a5b
parent afc7b857308aae3e33290f6af82ad8699cafde36
author Dan Stoza <stoza@google.com> 1428440706 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428440706 +0000

am afc7b857: am e849af87: Cherry-pick two BufferItem changes

* commit 'afc7b857308aae3e33290f6af82ad8699cafde36':
  Cherry-pick two BufferItem changes