tree 8ffef448f98984eccbd5416e7076eae16bc5db34
parent ec9d2596194868e9eefcfc33a22a7e0fdedf2299
parent 86f962159a0cc3c5b56d7fcf8d4187eefd5f4442
author Dirk Dougherty <ddougherty@google.com> 1360012669 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360012669 -0800

am 86f96215: am 29c40abf: am 18e9a79f: am 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev

# Via Android Git Automerger (4) and others
* commit '86f962159a0cc3c5b56d7fcf8d4187eefd5f4442':
  Doc change: Remove proto scheme from src urls (fix mixed content warning).