tree 42e7be42d408e2b1b6f237c655f3f3f0c82ed22c
parent 25e7b8fcc3708b58736c7825ecf612d04020716e
parent f7e148c1bc482fe7f8df49d216b1f9390f0638b9
author The Android Open Source Project <initial-contribution@android.com> 1275581643 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275581643 -0700

am f7e148c1: merge from open-source master

Merge commit 'f7e148c1bc482fe7f8df49d216b1f9390f0638b9' into kraken

* commit 'f7e148c1bc482fe7f8df49d216b1f9390f0638b9':
  adb connect and disconnect improvements: