am f36aa8ec: (-s ours) am 5563b77a: am 57532b2a: Merge "adb: improve network error info"

* commit 'f36aa8ec5de6a254d2b2e3849d2d4d203a09ee9f':
This commit is contained in:
Elliott Hughes 2015-08-27 11:53:07 +00:00 committed by Android Git Automerger
commit bb640d5ff4

Diff content is not available