am a32b5978: (-s ours) am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread

* commit 'a32b5978b700abf02e9fe6ae4eb95dfd4c158e4f':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb