tree ba77b153caaf4cdc98bdd7827ae8d17b9ce68cc5
parent ce1340c665e8840c8856898bbfb7ee3b33765359
parent c121c69b856bfa9baea105439fbdac648d154097
author Colin Cross <ccross@android.com> 1389290515 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389290515 +0000

am c121c69b: am b0751101: Merge "HP USB ID"

* commit 'c121c69b856bfa9baea105439fbdac648d154097':
  HP USB ID