commit | c7540910efe5bff108f9ccd19fc17b3932cebbe5 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Thu May 28 18:02:53 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 18:02:53 2015 +0000 |
tree | cd95ced967fb21da68211d72de42d3a9cf325bf7 | |
parent | e57c59388126b06f14f7a0b4b31c59d0b5dea89d [diff] | |
parent | fb11859fe58ee328f7728e4fb613ea3cd160c151 [diff] |
am fb11859f: am e023778e: 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 'fb11859fe58ee328f7728e4fb613ea3cd160c151':