tree 887af8a102ee2a9cd679d12eefc2a39f3316aba5
parent 91a4160f5ceae04f7612421e87ad0bf266525fc7
parent f183a42fb39f008c13e6ffdaa28766f8b78b43d3
author Elliott Hughes <enh@google.com> 1386283553 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386283553 +0000

am f183a42f: (-s ours) am 49f2e1ce: am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"

* commit 'f183a42fb39f008c13e6ffdaa28766f8b78b43d3':