tree 4140864e7dd4aa2e2f0dc084a9962b5ccf4d65e8
parent 2b4962b19767089cc267ad2cf90583a99db8f38e
parent e2247907a35dc8a5e127a2c40d9c3f720b021a33
author Marco Nelissen <marcone@google.com> 1419369789 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1419369789 +0000

am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev

* commit 'e2247907a35dc8a5e127a2c40d9c3f720b021a33':
  Add tests for midi playback