tree f455ec710a46fd13139d643caf42a8063032bce1
parent d2633cb70978b42bc8b2c524951a39de197a5edd
parent 64e99545d4b5600bb5ca044fcad636ae8389b381
author Mike Lockwood <lockwood@android.com> 1259465537 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259465537 -0800

am 64e99545: adb: fix -d and -e options for "adb forward" command.

Merge commit '64e99545d4b5600bb5ca044fcad636ae8389b381' into eclair-mr2-plus-aosp

* commit '64e99545d4b5600bb5ca044fcad636ae8389b381':
  adb: fix -d and -e options for "adb forward" command.