tree 283ca1c9cded2c868b34fe4d9fd66e1cbf8f9a12
parent 4a6e78a59279e474338e2fb5af95123ecf23797c
parent 5bb603c1e1984dcac0bc7b0e4f82c623710d54a8
author Andreas Huber <andih@google.com> 1366385977 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366385977 -0700

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

* commit '5bb603c1e1984dcac0bc7b0e4f82c623710d54a8':
  Make sure MediaCodec::stop() and MediaCodec::release() still return