| commit | 20f410a41890113de126680518c13cdab359c66d | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 21 18:06:39 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 21 18:06:39 2010 -0800 |
| tree | 9da9343c319bdc3dd84a8d314f801ef0016258b2 | |
| parent | 114e398f66bf5d521721abfa1933dc989bb5a135 [diff] | |
| parent | dc9cf66c6e470f0ebcd77006e3f549c338ab4fab [diff] |
resolved simple conflict with dc9cf66c
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c index 1a0183f..1308f26 100644 --- a/fastboot/fastboot.c +++ b/fastboot/fastboot.c
@@ -151,6 +151,7 @@ (info->dev_vendor != 0x0451) && (info->dev_vendor != 0x22b8) && // Motorola (info->dev_vendor != 0x0502) && + (info->dev_vendor != 0x413c) && // DELL (info->dev_vendor != 0x0bb4)) // HTC return -1; if(info->ifc_class != 0xff) return -1;