tree c2f44451b6650cc2ae5cd6a9d7c8d00effb29d67
parent 3eb45836003e92830ff423f9260ce326e6e7f607
parent 8f5228afe671b5e80fab4d1c55452ad6c83ef4f1
author Phil Burk <philburk@google.com> 1438292463 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438292463 +0000

am 8f5228af: Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev

* commit '8f5228afe671b5e80fab4d1c55452ad6c83ef4f1':
  UsbMidiDevice: add timestamps for input events