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

Change-Id: Iaf8e7f613c1b5fa2a91eec34f008c0f76bf9bd6b


Trivial merge