tree 8f2afbd8b76c72f32fc5f74b30ca6610c226133b
parent 7da2397583445a263fcad23f548951d13cf3b4bb
parent 4c6b494a109186791bfc421bc10f35eaae871174
author Mike Lockwood <lockwood@android.com> 1310497171 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310497171 -0700

am 4c6b494a: Merge "adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones"

* commit '4c6b494a109186791bfc421bc10f35eaae871174':
  adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones