am 114e398f: Merge commit \'f71f068fb9082ad78c78493c1295074e88a5526c\' into eclair-plus-aosp

Merge commit '114e398f66bf5d521721abfa1933dc989bb5a135'

* commit '114e398f66bf5d521721abfa1933dc989bb5a135':
  Add DELL's USB Vendor ID to adb - DO NOT MERGE