tree 4a9d7383a9dad5a90e3e871dd90d969737d1d71a
parent 50970341bfaf0c218e7fff29e0b2fb652387e274
parent b544da0be42cdd1e28d6562a26215d57c51b2f2b
author Colin Cross <ccross@android.com> 1366236807 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366236807 -0700

am b544da0b: am d7cab8bf: Merge "adb : add missing connection states"

* commit 'b544da0be42cdd1e28d6562a26215d57c51b2f2b':
  adb : add missing connection states