| commit | 65b33c92acc0381acaed5de532bdc7c3e44c6bd5 | [log] [tgz] |
|---|---|---|
| author | Phil Burk <philburk@google.com> | Wed Aug 05 20:03:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 05 20:03:17 2015 +0000 |
| tree | 22f6c27c257406d5e07daaaf040fd6cbd2fb024a | |
| parent | c32132853f9eaf62ec59fa375a288b957c50e53a [diff] | |
| parent | 7cc0cda18e5e5bd235041fa2589999c6d4109127 [diff] |
am 7cc0cda1: am 881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev * commit '7cc0cda18e5e5bd235041fa2589999c6d4109127': MidiManager: use ConcurrentHashMap