tree d922a79081d30e6b8409a6b38d3a1db233ed0cad
parent 92df8753a8aa0374244a87daae0b50b328d28184
parent bba8cbdad8b3276b6985d13aaa340080357cc158
author Marco Nelissen <marcone@google.com> 1419368751 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1419368751 +0000

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

* commit 'bba8cbdad8b3276b6985d13aaa340080357cc158':
  Add tests for midi playback