tree d24662765efb56cafea68fb4a7e2434cde9799eb
parent ccbb46d647a4641b2da2455f6a7f84df1df37fdb
parent ac86c21c4ca58466c39a0b4f674160c9f17a2a20
author Eric Laurent <elaurent@google.com> 1444713681 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444713681 +0000

am ac86c21c: (-s ours) am 8738d736: am a14d1bd7: am c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev

* commit 'ac86c21c4ca58466c39a0b4f674160c9f17a2a20':
  MidiBluetoothService: add new device to HashMap