tree 6505d79625d91ebf0fd3011970350eabb448bc2c
parent ae852b0b7bbccbc3c34a3dc17c2565d88d2120ab
parent 2871a0102fe8b7aa56a27097a81776b15fc75d06
author Josh Gao <jmgao@google.com> 1496363644 +0000
committer android-build-merger <android-build-merger@google.com> 1496363644 +0000

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

Change-Id: I5db3903d12a686394f8ce94078b202a3a52d2d71