tree 69f9ff7cd8b248837d9903c1d551d27b1051adfb
parent 61cf860801f1106d71124c69deebfb53ec25ac69
parent 6dcbcb7a539a7704672cc22dba3ac12cf5622b36
author Dirk Dougherty <ddougherty@google.com> 1372269913 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372269913 -0700

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

* commit '6dcbcb7a539a7704672cc22dba3ac12cf5622b36':
  Adjust the redirects for edu and a couple others.