commit 8a0ba1b1e4f5117da63b8e530ef7c6ba3dc8838c
author Robert CH Chou <Robert_CH_Chou@acer.com.tw> Wed Sep 23 11:33:04 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 23 11:33:04 2009 -0700
tree 3a87623094efdd7c499b3e19a98157fb150275ea
parent 05c2df2b41e7f02611cf21bff7c8bb2ba04f31ab
parent 9aaa76a7af547a34251c4eb480a4aa3d7485b56d

am 9aaa76a7: am 79aedbee: Merge change 26423 into eclair

Merge commit '9aaa76a7af547a34251c4eb480a4aa3d7485b56d'

* commit '9aaa76a7af547a34251c4eb480a4aa3d7485b56d':
  Add support for Acer devices

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 394edc3..5534fd9 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -47,6 +47,8 @@
 #define VENDOR_ID_LGE           0x1004
 // Huawei's USB Vendor ID
 #define VENDOR_ID_HUAWEI        0x12D1
+// Acer's USB Vendor ID
+#define VENDOR_ID_ACER          0x0502
 
 /** built-in vendor list */
 int builtInVendorIds[] = {
@@ -56,6 +58,7 @@
     VENDOR_ID_MOTOROLA,
     VENDOR_ID_LGE,
     VENDOR_ID_HUAWEI,
+    VENDOR_ID_ACER,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))