tree 15823e6732df10d6712367fe543c9aa73dca6adf
parent c2081f404851adda6105cb7306abd2527653ae15
parent e4f0d04b3788e6295f9126481912956f4697592d
author Marco Nelissen <marcone@google.com> 1419372166 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1419372166 +0000

am e4f0d04b: am ca3cc4d4: am 4cd3894f: am 869d2524: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev

* commit 'e4f0d04b3788e6295f9126481912956f4697592d':
  Add tests for midi playback