tree ec0f96c66e44c39e83800bb7a02792ab57781e99
parent b4c7472f8e05e600b1097b61288dc20aa19c002c
parent 3170358336dbe466cd3e9a5517e8e579b47cd084
author Dan Stoza <stoza@google.com> 1427912801 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427912801 +0000

am 31703583: (-s ours) Merge "DO NOT MERGE libstagefright: Stop using IGBC::BufferItem"

* commit '3170358336dbe466cd3e9a5517e8e579b47cd084':
  DO NOT MERGE libstagefright: Stop using IGBC::BufferItem