tree 32d03d4622b85d57ef7077c6c3ea18afe5f0f353
parent 3c4fa654801fcf51a92cefd62e28a020d39e08d0
parent 9d47e7b6d40cc38fb1c638c991312a4217bfa333
author Selim Gurun <sgurun@google.com> 1366442385 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366442385 -0700

am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit '9d47e7b6d40cc38fb1c638c991312a4217bfa333':
  DO NOT MERGE Add a delimiter between scheme and host