tree 731b81cf45290fa50b91d81c8d9ea04bb31d3995
parent 9fe7014d056ac6478069d6f2e946ddbe2863d576
parent 876f436668036e8e9d3f86434eee1a44ff5364b8
author Elliott Hughes <enh@google.com> 1377704222 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377704222 -0700

am 876f4366: am a7f6e015: Merge "correct msi usb vendor id."

* commit '876f436668036e8e9d3f86434eee1a44ff5364b8':
  correct msi usb vendor id.