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

* commit 'fc88f94fc32fc010b153af32dea8e1fd4bae1f19':
  DO NOT MERGE: Clean up USB notifications: