tree 44113f9b32efc0a8aa09edf4178ff9aab7204386
parent 638986a78c94081cded0cd87dc9d3b31965092a4
parent 8260bf63e2fa974b524029f170d9ad17b69b884f
author Glenn Kasten <gkasten@android.com> 1396544947 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396544947 +0000

am 8260bf63: am 93bbc834: Merge "Fix aac decoder flush"

* commit '8260bf63e2fa974b524029f170d9ad17b69b884f':
  Fix aac decoder flush