tree 7eda5eb75b2d49d6b1f4c1d967426704e9a8f3a3
parent 99c1a4168ba792437f298d31cd4631ff01661476
parent d92e35eb7b97f349054390cfee1d40154dba6d66
author Elliott Hughes <enh@google.com> 1371580378 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371580378 -0700

am d92e35eb: Merge "Add Qisda usb config"

* commit 'd92e35eb7b97f349054390cfee1d40154dba6d66':
  Add Qisda usb config