tree 07e9bb4cdec0a603eb1d068f0cf2c0a43b9bf497
parent d662bf1a50e7a19f5ea301a8083aeb6dabee4b0a
parent 1b173c6d5dceac14a42e6bf92980d0e247f5ccbc
author Dirk Dougherty <ddougherty@google.com> 1368628789 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368628789 -0700

am 1b173c6d: am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs

* commit '1b173c6d5dceac14a42e6bf92980d0e247f5ccbc':
  Doc change: add redirects for edu urls.