tree f6d92d511ecbfa43542c2d559cfd504a97214b01
parent 610722a466783fe6b8d171f036bddb781220f1f1
parent 6a48dbef114ffba92b0227523dee578014c4edd0
author Marco Nelissen <marcone@google.com> 1420592230 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420592230 +0000

am 6a48dbef: am 12862522: am 7403e54f: am 9236bf39: resolved conflicts for merge of 56213945 to lmp-dev

* commit '6a48dbef114ffba92b0227523dee578014c4edd0':
  Add tests for midi playback