| commit | 7403e54f76d3969ad4bfbfa243b77688e4cb3547 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon Jan 05 16:34:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 05 16:34:21 2015 +0000 |
| tree | 227cd9185ad45edda3954e45ebbd3c33c65fb4c0 | |
| parent | 4bd6622fa51d33e2c6d2776f07a1b12fc93a9b3e [diff] | |
| parent | 9236bf3927aa03c32c714b1c8c84628fc7d150ef [diff] |
am 9236bf39: resolved conflicts for merge of 56213945 to lmp-dev * commit '9236bf3927aa03c32c714b1c8c84628fc7d150ef': Add tests for midi playback