| commit | 6a48dbef114ffba92b0227523dee578014c4edd0 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Jan 06 22:50:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 06 22:50:31 2015 +0000 |
| tree | afae2a88ea7e8c35371d1877c9527e05bb3bda3b | |
| parent | 2ff688800e429e857efedee5d90d2f93a3f40c39 [diff] | |
| parent | 128625222ca68a19d4cc47cca0804e598219d9a6 [diff] |
am 12862522: am 7403e54f: am 9236bf39: resolved conflicts for merge of 56213945 to lmp-dev * commit '128625222ca68a19d4cc47cca0804e598219d9a6': Add tests for midi playback