tree 16b559da08eafdc1fca406904aba5d6bf11cb505
parent 4713d3dc48cec162f4aeb3513719a8dd153e8c85
parent 4b40f7ef5a9d29006dcb3351086fc13f1a8e0fa2
author Andreas Huber <andih@google.com> 1365788297 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365788297 -0700

am 4b40f7ef: am 5157b1e8: Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev

* commit '4b40f7ef5a9d29006dcb3351086fc13f1a8e0fa2':
  ACodec now signals an error if the mediaserver died while it is in