tree 3a46daf66665b3085da875facb9604f18ad3d3b5
parent 4082bf8c963dbd44fe2f6367fa687217cbac58d3
parent 3794c96f3e7bb27e56336035bcd7ac643c6869fc
author Colin Cross <ccross@android.com> 1389290657 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389290657 +0000

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

* commit '3794c96f3e7bb27e56336035bcd7ac643c6869fc':
  HP USB ID