tree 2c33b67778d5e21275e842760c820e7f3fb2cbcd
parent 072097bd3f2b685b4b21d415c2b70cbca9eb76fd
parent 881cd15519535e493d497fefd857f8fe0236c774
author Phil Burk <philburk@google.com> 1438804427 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438804427 +0000

am 881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev

* commit '881cd15519535e493d497fefd857f8fe0236c774':
  MidiManager: use ConcurrentHashMap