tree b2d13d92501159b8edf2806a22f0b1c64c28b23d
parent 349d1c1be5fc9ffdb8ff3c9375743599548339ca
parent 86948aa6106d25017bd3acf07a7f147b716f8eda
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517494490 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517494490 +0000

[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e am: c1cb058249 am: 2c70774e72 am: 3ec9cb8d3a am: 2876452814 am: af5c532cc8 am: 86948aa610

Change-Id: I54351ca2122f59d01ebc36377efca2c22c4a89de