am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE

* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
  Add support for USB Ethernet adapters
This commit is contained in:
Benoit Goby 2011-04-11 18:53:57 -07:00 committed by Android Git Automerger
commit f3a0fcc94b

Diff Content Not Available