OSDN Git Service

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-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)
commitfea4158eeaa3f9a4533d7f1d684a60b34d53a46a
treeb538339e12f7ae066b9a3eff66ef718e01982430
parente2417e6682cd6c33c5b9dc5d9cf7092de7afce13
parentfddbf1b6b25792fe04c0c38977555079bc6c3bcb
Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev

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