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:
tree: 539d89ca8a1c9b515416402633c4f1e04738c7b9
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE