am 86f1c4d3: (-s ours) am e91e5f6e: (-s ours) am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread
* commit '86f1c4d3':
DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect