d2d66b5f481deadf7c33a313ce54386723b968cf - platform/frameworks/base

commit	d2d66b5f481deadf7c33a313ce54386723b968cf	[log] [tgz]
author	Adam Vartanian <flooey@google.com>	Thu Feb 01 10:02:43 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu Feb 01 10:02:43 2018 +0000
tree	d92afad4fb9e337923835f5ae9118eba615fb08a
parent	a3f097693791b4571440f685837640d26a499ff8 [diff]
parent	373cfa75c083592c1084b94c9c917016f539cbb2 [diff]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr1.5-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
  [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.

tree: d92afad4fb9e337923835f5ae9118eba615fb08a