tree 32d03d4622b85d57ef7077c6c3ea18afe5f0f353
parent c6af49efc467e379e7ac56246e9c7f0e6ebddc00
parent 8225df007e44966335115939e374f676aa8e6e4b
author Geremy Condra <gcondra@google.com> 1366310409 -0700
committer Geremy Condra <gcondra@google.com> 1366310409 -0700

DO NOT MERGE Merge commit '8225df00' into bp

Add a delimiter between scheme and host

Bug: 6923539
Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47