am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed...
am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
* commit '54e96c69':
DO NOT MERGE UsbManager: squashed commit of: