[automerger skipped] Merge "DO NOT MERGE: GetDevices: Also allow `\-` to be part...
authorChris Forbes <chrisforbes@google.com>
Thu, 31 May 2018 23:49:52 +0000 (16:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 May 2018 23:49:52 +0000 (16:49 -0700)
commitd1cb9980e579d98d8281fcf28796c3e1d9794de7
tree48276ce25141ef0459f044c59687078c9d7f3f77
parent2caa0005d102399c6d10679351102dcdf27bdb46
parent6f687edc46450d46c022616f5940bbb767ac73da
[automerger skipped] Merge "DO NOT MERGE: GetDevices: Also allow `\-` to be part of the host name"
am: 6f687edc46  -s ours

Change-Id: I9710bde0d777131a9068fc554185e50bfa68efbc