tree 7e9006025204ffbe72d7c93a8d1547e064e18bf8
parent 8e8f9758d01c8be201ea5601b4f724543ca7d27e
parent c07073b8bb25e90dfe77c83a0badb4773b0377ec
author Eric Laurent <elaurent@google.com> 1351006289 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351006289 -0700

am 5f6f5b7d: Merge "stagefright: discard audio at start of capture" into jb-mr1-dev

* commit '5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1':
  stagefright: discard audio at start of capture