tree 2aa2cb6936c908494527967d2b865eaf6392b787
parent 329a7c4c1b3a383fab40f3144f2011786ff0c05d
parent 9b1d182b5d5de326a3a9ba9e0c8e8014f1c62774
author Robert Ly <robertly@google.com> 1304540088 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304540088 -0700

am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1

* commit '762481f0b58ac41b7583f74315fcb213ca0eb630':
  adding the usb apis to the resources browser