[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)
am: 6f687edc46  -s ours

Change-Id: I9710bde0d777131a9068fc554185e50bfa68efbc


Trivial merge