tree 8922613e2f717fd9e013679cfbcc8b54c6a64e79
parent 7d47fbf346a31c07a403bf6898220e7e4045ed34
parent 120f7eb5e25ce884c30454ae9ad56b1e2c3de101
author Dirk Dougherty <ddougherty@google.com> 1359757561 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359757561 -0800

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

# Via Android (Google) Code Review (1) and others
* commit '120f7eb5e25ce884c30454ae9ad56b1e2c3de101':
  Doc change: Remove proto scheme from src urls (fix mixed content warning).