tree a5cb41c9c6c4b39e2e5238610d544336b84d947c
parent ac76c1f16f889140ec5c56faccd676c2ff15d7bc
parent d7cab8bff1334ba48620a16d1b98f2ae623fee7d
author Colin Cross <ccross@android.com> 1366236699 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366236699 -0700

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

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