commit | 4bec70f0da9ebfab34ea0e61059bea7ceb2cc0b7 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Thu May 28 16:40:51 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 16:40:51 2015 +0000 |
tree | 5d4f41678c28d308029691c498cfb3acbfd3eb8e | |
parent | b3a6d772f2b9f0dc0421040e79a80880dd6ec2eb [diff] | |
parent | 5d52037f63226d1831cc4a0e4f54cb1093bc2b4b [diff] |
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 '5d52037f63226d1831cc4a0e4f54cb1093bc2b4b':