| commit | 8d5e35ad8129e19b64bf1ecbe58764863fb4633c | [log] [tgz] |
|---|---|---|
| author | Phil Burk <philburk@google.com> | Wed Aug 05 20:09:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 05 20:09:49 2015 +0000 |
| tree | 2cd412ed1b7bec6769eef6ab024f3f1842e6dccf | |
| parent | 469840aa48e30d96a1f5329d38e177ab18b924d9 [diff] | |
| parent | 65b33c92acc0381acaed5de532bdc7c3e44c6bd5 [diff] |
am 65b33c92: am 7cc0cda1: am 881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev * commit '65b33c92acc0381acaed5de532bdc7c3e44c6bd5': MidiManager: use ConcurrentHashMap