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

* commit '91dceb8143c9dab6b9b0ad38b5a3d7bb0586c677':
  DO NOT MERGE UsbManager: squashed commit of: