tree 96cf322f784951caac48f941bf7a5fda2461373f
parent 96db405f379548ad7a85cd7bdad4e5d21ba5bbf4
parent 67e6fcd19533f54ca37cbe72425f55a40a7f0333
author The Android Open Source Project <initial-contribution@android.com> 1277146344 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277146344 -0700

am 67e6fcd1: merge from froyo-plus-aosp

Merge commit '67e6fcd19533f54ca37cbe72425f55a40a7f0333'

* commit '67e6fcd19533f54ca37cbe72425f55a40a7f0333':
  added vendor ID for http://www.onthegovideo.com/
  Fix build - cpu-features is ARM-specific
  eliminate a compiler warning: signed/unsigned length
  adb: optimize socket-list-walking code
  adb: remove unneeded assignment of id to zero
  adb: clean up 0 --> NULL for pointers
  - creates proper ifc.h and dhcp.h headers for libnetutils
  Adds support for UBFX to JIT and Disassembler