am eab5a349: Merge "Revert "Add a delimiter between scheme and host"" into jb-mr2-dev
am eab5a349: Merge "Revert "Add a delimiter between scheme and host"" into jb-mr2-dev

* commit 'eab5a3491b16ec9dd8c010de3fce1cc9f11afb55':
  Revert "Add a delimiter between scheme and host"

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base