OSDN Git Service

am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE
authorBenoit Goby <benoit@android.com>
Tue, 12 Apr 2011 01:53:57 +0000 (18:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Apr 2011 01:53:57 +0000 (18:53 -0700)
commitf3a0fcc94b57ff72497d9d9812997269c9be54c9
tree2aa2cb6936c908494527967d2b865eaf6392b787
parente80ff06e1c027e2dba05b406b54196b3e9742160
parent29d013afa943fb8f4fbd7b7367c0aa6a9884ff32
am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE

* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
  Add support for USB Ethernet adapters