tree 94303938ff73cd204266b21d12f4fef81f655605
parent b2d8f896b6ef081c1af263dd13d91d2f435de0fa
parent 70580b20bc8485002df0b3e89e42754c8c9796ff
author Jean-Baptiste Queru <jbq@google.com> 1327423745 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327423745 -0800

am 70580b20: am 149ae11f: Merge "adb,fastboot: add USB support for Intel Vendor ID"

* commit '70580b20bc8485002df0b3e89e42754c8c9796ff':
  adb,fastboot: add USB support for Intel Vendor ID