tree 8353c6014b6abce66d60b96e2248a9fb459fccda
parent 3d37ca42fe620c1cef89f7fa13cb8cac3cf356bb
parent 91dceb8143c9dab6b9b0ad38b5a3d7bb0586c677
author Mike Lockwood <lockwood@android.com> 1299005932 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299005932 -0800

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

* commit '91dceb8143c9dab6b9b0ad38b5a3d7bb0586c677':
  DO NOT MERGE UsbManager: squashed commit of: