| commit | 3f0651d12b5c4b01ab0347412ae0e2e5fe2aadaa | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Fri Apr 12 10:38:17 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 12 10:38:17 2013 -0700 |
| tree | 16b559da08eafdc1fca406904aba5d6bf11cb505 | |
| parent | 4713d3dc48cec162f4aeb3513719a8dd153e8c85 [diff] | |
| parent | 4b40f7ef5a9d29006dcb3351086fc13f1a8e0fa2 [diff] |
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