tree 8bdd0bf815c10b2b38049f71b4c6771b969a3122
parent dafbdeeb75856965de07aa64c405b518e9cdf373
parent eb2a7346c2270a7fb3cc3e127f7b52ba20df1fb7
author Marco Nelissen <marcone@google.com> 1421288879 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421288879 +0000

am eb2a7346: resolved conflicts for merge of 9e5929ad to lmp-mr1-dev-plus-aosp

* commit 'eb2a7346c2270a7fb3cc3e127f7b52ba20df1fb7':
  MidiFile: report correct state during transient period when start() is called first time.