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