tree b668782e83ed4899409d968340ea34e61a0fede2
parent a61bcad58ba1f7359183a333ee58303ed67e4a2f
parent 9526a788a6bd528e14622404e8750bdcc147d15a
author Scott Anderson <saa@android.com> 1335926021 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335926021 -0700

am 9526a788: Merge "adb: Add ability to specify device path" into ics-aah

* commit '9526a788a6bd528e14622404e8750bdcc147d15a':
  adb: Add ability to specify device path