tree 5b29f5c91ac563c637b1e605ef219a3b2179607b
parent 189b10f8b06c2c46c667f40fe14592d6f1d99f4a
parent 447d2d7b7441bd6e1a1aac81170a4c85ad5c4495
author Marco Nelissen <marcone@google.com> 1366934286 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366934286 -0700

am 447d2d7b: Merge "Add more MediaCodec.flush() related tests" into jb-mr2-dev

* commit '447d2d7b7441bd6e1a1aac81170a4c85ad5c4495':
  Add more MediaCodec.flush() related tests