commit | e023778ec926b2cdfe43f347eb45918c867f21f0 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Thu May 28 17:11:46 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 17:11:46 2015 +0000 |
tree | 0470f4b79904b01d993b2d92c6db5bf0f75cc86d | |
parent | 6943917422b90a232e762e9380cbea0894b00943 [diff] | |
parent | a686eb3b234fde152b500776cb2168f7b8665522 [diff] |
am a686eb3b: am 4bec70f0: am 5d52037f: am fb845761: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev automerge: 869d252 automerge: 1a174fc automerge: 877f741 automerge: 7831295 * commit 'a686eb3b234fde152b500776cb2168f7b8665522':