| commit | e58f4d20a1714c1c2ceb8dd7bd3cde0d8b988e31 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Jan 07 00:57:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 07 00:57:10 2015 +0000 |
| tree | f6d92d511ecbfa43542c2d559cfd504a97214b01 | |
| parent | 610722a466783fe6b8d171f036bddb781220f1f1 [diff] | |
| parent | 6a48dbef114ffba92b0227523dee578014c4edd0 [diff] |
am 6a48dbef: am 12862522: am 7403e54f: am 9236bf39: resolved conflicts for merge of 56213945 to lmp-dev * commit '6a48dbef114ffba92b0227523dee578014c4edd0': Add tests for midi playback