tree 70b4b03a21f4d200da08031d752de6607b34884e
parent 98b684bef5aad0c63f9d8cf47fba01c622c6aedd
parent 54e3e974aace59a4abae6257eef1f17bfb485618
author Selim Gurun <sgurun@google.com> 1389897492 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389897492 -0800

am 54e3e974: (-s ours) am c3fe47c9: am c28caf53: am fe7dc301: am 45507172: am 0bc1ffaa: Merge "DO NOT MERGE Convert the scheme to lowercase" into jb-dev

* commit '54e3e974aace59a4abae6257eef1f17bfb485618':
  DO NOT MERGE Convert the scheme to lowercase