tree b04cfad1e51b0b43891ed5dbfdafa8f6cb2c30a6
parent 9b86360fb41b46abfc0e475cfdea4370a93179d5
parent 6c65cd5db84361c66983903638ddb251762f9151
author Elliott Hughes <enh@google.com> 1402940509 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402940509 +0000

am 6c65cd5d: am 60218f19: Merge "Add gionee USB vendor id."

* commit '6c65cd5db84361c66983903638ddb251762f9151':
  Add gionee USB vendor id.