tree b5f41c6ce8703705a6018c958b09313528b1afc5
parent 4b4bd1b3456096b5f92372230f4ccae225ddd5c4
parent 1022b9999de8fb022db6923a55e37ffc7dfca176
author mike wakerly <mikey@google.com> 1344556147 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344556147 -0700

am 1022b999: Merge "Fix typo in UsbManager javadoc." into jb-dev

* commit '1022b9999de8fb022db6923a55e37ffc7dfca176':
  Fix typo in UsbManager javadoc.