tree 42707be7447efb55823bc45acbba05f38bcd218e
parent 4b40f7ef5a9d29006dcb3351086fc13f1a8e0fa2
parent 089edf2e227c72b7ff4fd9b9ed96320e21811d50
author Marco Nelissen <marcone@google.com> 1365787545 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365787545 -0700

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

* commit '089edf2e227c72b7ff4fd9b9ed96320e21811d50':
  Fix MediaCodec.flush()