tree 2e739126a1ba15fd398af5b4a104e34c95507c8b
parent bfea6dcfba792fe4277e1a625ed5778a06c537a5
parent 70aead08b513d48689fdee63de18ef5e442113f2
author Treehugger Robot <treehugger-gerrit@google.com> 1460579910 +0000
committer android-build-merger <android-build-merger@google.com> 1460579910 +0000

Merge changes Ibc8038b1,I1876ecd7,I57d70f8b am: 3e0eaa4
am: c35de74

* commit 'c35de74b2b9d017a74ca3da99f8c23aad033f0f5':
  adb: after `adb root`, wait for the device in any state.
  adb: add support for 'wait-for-any'.
  adb: make 'wait-for-{recovery,sideload,bootloader} work.

Change-Id: I153b8e88cea2b2e6d5916145bf1e1145c4721b14