tree e2a765b13dc09dfe61647e28e77b9ae6618ebe89
parent c5cbdfcfe517b55cd4578e5e5b6a682fcfdffbc7
parent 62b4cbceb33dc657cfaee2971ad6bc3d1aab3fbb
author Mike Lockwood <lockwood@google.com> 1430342761 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430342761 +0000

am 62b4cbce: am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev

* commit '62b4cbceb33dc657cfaee2971ad6bc3d1aab3fbb':
  MidiDeviceInfo: Add version string property