am 84edf14b: am cc08c439: Merge "UsbAccessory: Add URI string, replace type...
am 84edf14b: am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
* commit '84edf14b':
UsbAccessory: Add URI string, replace type string with description