tree 9599b02365d1853a8cc82e6831b24013ce79612e
parent 31df8e9ee888cd8ea5102294e0d5f9ac07571a38
parent 4cd3894f01fba8675ebdf07bfd910cc5e0fff407
author Marco Nelissen <marcone@google.com> 1419371192 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1419371192 +0000

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

* commit '4cd3894f01fba8675ebdf07bfd910cc5e0fff407':
  Add tests for midi playback