tree 6505d79625d91ebf0fd3011970350eabb448bc2c
parent 0f7775416ab78579aa48d8627081c537976946c4
parent 443b92da1b51630d7de7347bfdbb26e24ef17b3b
author Josh Gao <jmgao@google.com> 1496363174 +0000
committer android-build-merger <android-build-merger@google.com> 1496363174 +0000

Merge "adb: reunregress waiting for device on start-server."
am: 72076d1aa7

Change-Id: Ie00b2258e92e93b45e4c859cbec11a374b4f7557