commit db52df1433827a820710c1a47c9f3394f93049ed
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 12 18:50:26 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 12 18:50:26 2018 +0000
tree 90f0584b81d1a05bb111079a84b0519edd395e7b
parent 4d9c5ba68036dfe2b166bc150349a9a120e6c63f
parent a587b0915001a8dce7c54cea1d606066db6d8006

Merge changes from topic "am-eb46eb48-7a23-41b3-8b69-98a255b23038" into oc-dev

* changes:
  [automerger] Fix hostname parsing in java.net.URLStreamHandler. am: 512b127b59 am: 4a82518bb2 am: 183246ca0a am: 5d65bc915e am: 80d5f623d2
  [automerger] Fix hostname parsing in java.net.URLStreamHandler. am: 512b127b59 am: 4a82518bb2 am: 183246ca0a am: 5d65bc915e
  [automerger] Fix hostname parsing in java.net.URLStreamHandler. am: 512b127b59 am: 4a82518bb2 am: 183246ca0a
  [automerger] Fix hostname parsing in java.net.URLStreamHandler. am: 512b127b59 am: 4a82518bb2
  [automerger] Fix hostname parsing in java.net.URLStreamHandler. am: 512b127b59
  Fix hostname parsing in java.net.URLStreamHandler.