| commit | 331133ea00bafbd65a58dc587097ff0f46f7e49c | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Thu Apr 04 14:59:22 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 04 14:59:22 2013 -0700 |
| tree | 8dd30a073a0c299d6810d550d69b59c78c3ef905 | |
| parent | 74b4d6369dd516a47f69b74221b49f812cc396fc [diff] | |
| parent | 5cb91a722a43abdcb02ea5345cc0ac6b1089561e [diff] |
am 5cb91a72: am af69ca18: Merge "audioflinger: multiple tracks on direct output" into jb-mr2-dev * commit '5cb91a722a43abdcb02ea5345cc0ac6b1089561e': audioflinger: multiple tracks on direct output