am 3fa12d45: (-s ours) am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread

* commit '3fa12d459d16fb1d3d06b6c68b201340c9d3afcd':
  DO NOT MERGE: Clean up USB notifications: