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