tree 32022e9ac230439e5db88e48a4c0296b84ac1e47
parent aee3acd9e44c996643db7805589327e34ac12291
parent 9060ebb5f7f1b9d979e6ac32e32c719452583363
author Takeshi Kishimoto <kishimoto@google.com> 1279815736 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279815736 -0700

am 9060ebb5: am 91c38539: Added Toshiba\'s USB VID (0x0930) upon their request.

Merge commit '9060ebb5f7f1b9d979e6ac32e32c719452583363'

* commit '9060ebb5f7f1b9d979e6ac32e32c719452583363':
  Added Toshiba's USB VID (0x0930) upon their request.