am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread

* commit '54e96c69d068593f1d5893be6067509b07abdadc':
  DO NOT MERGE UsbManager: squashed commit of:
tree: bd73574526a2a13b96e0b8b595d33a90a6ecc804
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE