tree 878a1aebe636ab5c263d4df3650822c8ce6ef841
parent 6c11676e899faa45b618cea7811dc3f8fc595069
parent 78420edc0f3e99684c36f0d516744b4d9312a1c1
author Benoit Goby <benoit@android.com> 1364600593 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364600593 -0700

am 78420edc: resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aosp

* commit '78420edc0f3e99684c36f0d516744b4d9312a1c1':
  Add BYD's USB Vendor ID
  Add USB Vendor ID for Xiaomi
  Add vendor IDs to adb