tree a26b6e8f02f1232398fb5112b6b159f695e7aaac
parent c237e0549138d7884e6c99422f2ae7533f191a88
parent df1dba328c7dc042b2967733a14d1d8716b778e7
author Karsten Tausche <karsten@fairphone.com> 1534323405 +0200
committer Karsten Tausche <karsten@fairphone.com> 1534323405 +0200

Merge the 2018-09-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Fix hostname parsing in java.net.URLStreamHandler.

Change-Id: I4d26b24446f8857647a6f95103360d413dc81ceb