tree 065c20e650f333ff5cdb56a3f109180e9b1f884b
parent c2e8f144db456b1612ea95893b17ddc3cdb2e844
parent 2c157e0f127f36b4c709508f899c2a9f32ba3bd4
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