tree 8ee031fa32f8f9ec255462d995b35b0197ded66b
parent cdd3021936c90c7f561c569a32b65f6d32964aaa
parent dee5f1bb6e42875a1134d0e8efeef528b92cc548
author Mike Lockwood <lockwood@google.com> 1428684840 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428684842 +0000

Merge changes I075a54dc,I0a9bc7c3

* changes:
  Add user visible name for USB peripheral MIDI device
  Add MidiDeviceInfo.getPortList()