OSDN Git Service

am 5157b1e8: Merge "ACodec now signals an error if the mediaserver died while it...
authorAndreas Huber <andih@google.com>
Fri, 12 Apr 2013 15:24:50 +0000 (08:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Apr 2013 15:24:50 +0000 (08:24 -0700)
* commit '5157b1e8355ef3176536e4de793ec1b7679b7ad9':
  ACodec now signals an error if the mediaserver died while it is in


Trivial merge