tree 43654116cfddb44f1637b762ffe94d6321ff6e43
parent 3f0651d12b5c4b01ab0347412ae0e2e5fe2aadaa
parent fe028e58782566bd1a8bf9209848c2b00f2b339c
author Marco Nelissen <marcone@google.com> 1365788317 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365788317 -0700

am fe028e58: am 089edf2e: Merge "Fix MediaCodec.flush()" into jb-mr2-dev

* commit 'fe028e58782566bd1a8bf9209848c2b00f2b339c':
  Fix MediaCodec.flush()