tree f3a4d68599c4af61828c0ba620252f923129d440
parent 699249f9e4f8f5db6e798420fb1b5c6d2e16d42d
parent 3042c265bf3123426e99fed856c9d3b7fa3b3ad6
author Elliott Hughes <enh@google.com> 1376692663 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376692663 -0700

am 3042c265: am b3644d8f: Merge "Add USB Vendor ID for WACOM"

* commit '3042c265bf3123426e99fed856c9d3b7fa3b3ad6':
  Add USB Vendor ID for WACOM