tree c987b147691005e8676bfb11f43510abb3eee9e9
parent 74954fb11d10e6bd176b46250d471b445c3ced98
parent 151fff1468da510af19037687f666139edd1965e
author Colin Cross <ccross@android.com> 1366236807 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366236807 -0700

am 151fff14: am 6c4ed65b: Merge "adb : add missing connection states"

* commit '151fff1468da510af19037687f666139edd1965e':
  adb : add missing connection states