tree 00d26b55f42d4d3417d0eba024695f2eb8baf7b4
parent 22bfc4cca03197036c3b49e7c2cf47a0a23fce87
parent b1cfa672014d197d6d4d12fca0d40cd59de436bc
author Mike Lockwood <lockwood@android.com> 1311945764 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311945764 -0700

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

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