[automerger skipped] Merge "DO NOT MERGE: GetDevices: Also allow `\-` to be part...
authorChris Forbes <chrisforbes@google.com>
Fri, 1 Jun 2018 00:17:16 +0000 (17:17 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 00:17:16 +0000 (17:17 -0700)
commit491e5379a9762f1ed5b7f8386eb7335a83667ea6
tree3c3bf21e6e78fe050141e2f1e88c0a1f2fe244ad
parent8f9f6db2aed9f664faaa2ad7f0af84d54a3df198
parentd1cb9980e579d98d8281fcf28796c3e1d9794de7
[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