tree 3c3bf21e6e78fe050141e2f1e88c0a1f2fe244ad
parent 8f9f6db2aed9f664faaa2ad7f0af84d54a3df198
parent d1cb9980e579d98d8281fcf28796c3e1d9794de7
author Chris Forbes <chrisforbes@google.com> 1527812236 -0700
committer android-build-merger <android-build-merger@google.com> 1527812236 -0700

[automerger skipped] Merge "DO NOT MERGE: GetDevices: Also allow `\-` to be part of the host name" am: 6f687edc46  -s ours
am: d1cb9980e5  -s ours

Change-Id: Iaf8e7f613c1b5fa2a91eec34f008c0f76bf9bd6b