OSDN Git Service

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dev
authorAdam Vartanian <flooey@google.com>
Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)
commitf0913af9388e63348167d1f4136930d5d3d99286
treedda78310d6584cbf3dc26dc220aa5bc164571738
parentc3d7250b99f7b59cf3ea153d696c4c8db0b5252a
parent97668ae137233a1176b78aa3442ce5f1fdc978d1
Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.