commit | 748ab31ffbe3268249a8ef3dadbf6a79bd8df389 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Mon Jan 06 20:26:16 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 06 20:26:16 2014 +0000 |
tree | 74bc9ed506fdf20f9b1e07481a8075fff9a28367 | |
parent | 950909c301e316783e5b4687dbc422ed845cb69a [diff] | |
parent | d8f74f1b3e40d64fafcd327066428235f0312c47 [diff] |
am d8f74f1b: am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ... * commit 'd8f74f1b3e40d64fafcd327066428235f0312c47': adb: Add USB vendor ID for YotaDevices adb: Add USB vendor ID for TechFaith adb: Add USB vendor ID for Rockchip adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd. adb: Add USB vendor ID for Allwinner adb: Add USB vendor ID for Amlogic added Gigaset's USB vendor ID adb: alphabetically sort usb vendors lists