tree 20fc9775f4cead2bf71cd8d7b047478935b2c65e
parent 51a958645ce9aeb4f8dc56d66a85d0005273a6ca
parent c7a67d0fc4121abb0bc5f11aeda4d848ea8e0690
author Xavier Ducrohet <xav@android.com> 1337106599 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337106599 -0700

am c7a67d0f: resolved conflicts for merge of 246808be to jb-dev-plus-aosp

* commit 'c7a67d0fc4121abb0bc5f11aeda4d848ea8e0690':
  Add USB Vendor ID for Yulong Coolpad.