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

* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
  Add support for USB Ethernet adapters
tree: 2aa2cb6936c908494527967d2b865eaf6392b787
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE