tree 641fb7c859319df7b4bd342435da1052c4c58222
parent 57bdca25df1f0e77fd37e13ee3e1b5683856b683
parent 723791e2a829a3254d95fdea1ead9ce542ecbf25
author Andreas Huber <andih@google.com> 1366385824 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366385824 -0700

am 2c157e0f: Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev

* commit '2c157e0f127f36b4c709508f899c2a9f32ba3bd4':
  Make sure MediaCodec::stop() and MediaCodec::release() still return