tree 39509950f9aa8959028b2ec7c8f27584284eb3e9
parent 58a0f1bc860e6603970c5178294a7dd1709e9dad
parent 90b9ab16f9f8730f69905f56055c5364d26ce888
author Dirk Dougherty <ddougherty@google.com> 1372269774 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372269774 -0700

am 90b9ab16: Merge commit \'b1637825\' into manualmerge

* commit '90b9ab16f9f8730f69905f56055c5364d26ce888':
  Adjust the redirects for edu and a couple others.