am cc7d3c53: am b22bb1da: Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1

* commit 'cc7d3c539abd4affd5e95cff8740d9303deac63d':
  UsbManager: Fix broken Javadoc links