tree d4833ac0aa4f1e7e0d1abc0d62fab74f2ff5519b
parent 8621b5ea475822499128e6f138a9dfc224bbb569
parent d1015de919308ec0a99643f5b2837774d7a3dc62
author Mike Lockwood <lockwood@android.com> 1311945477 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311945477 -0700

am d1015de9: Merge "adb: Add USB vendor ID for Vizio"

* commit 'd1015de919308ec0a99643f5b2837774d7a3dc62':
  adb: Add USB vendor ID for Vizio