tree f820ba96d8f28b2e66cc5573aa78dcb0e431a804
parent 3fc108acf2b05153489730178c85b8db94f603af
parent 4309d602b562eb9f181b0314837e6096577c6c18
author Xavier Ducrohet <xav@google.com> 1279695342 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279695342 -0700

am 4309d602: Merge "Added Toshiba\'s USB VID (0x0930) upon their request." into gingerbread

Merge commit '4309d602b562eb9f181b0314837e6096577c6c18' into gingerbread-plus-aosp

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