am 461ead42: am 91535cff: Merge "Add vendor IDs to adb" into jb-mr2-dev

* commit '461ead42fe8ab082c3ee5dd750a63ddbe45ea98a':
  Add vendor IDs to adb