tree 22f6c27c257406d5e07daaaf040fd6cbd2fb024a
parent c32132853f9eaf62ec59fa375a288b957c50e53a
parent 7cc0cda18e5e5bd235041fa2589999c6d4109127
author Phil Burk <philburk@google.com> 1438804997 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438804997 +0000

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

* commit '7cc0cda18e5e5bd235041fa2589999c6d4109127':
  MidiManager: use ConcurrentHashMap