summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-05-15 07:33:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-15 07:33:18 -0700
commitb705986179b1bbda80c9281477a4d6b6b6d27e88 (patch)
tree949e066f1d4e4cb2c72e425d30e3c323468ff87b
parentaa0acfc8761fc8802879f90511b904061a523ed2 (diff)
parent2694897a3c20b79e3b28601ee43bcaefec827232 (diff)
downloadframeworks_base-b705986179b1bbda80c9281477a4d6b6b6d27e88.zip
frameworks_base-b705986179b1bbda80c9281477a4d6b6b6d27e88.tar.gz
frameworks_base-b705986179b1bbda80c9281477a4d6b6b6d27e88.tar.bz2
am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '2694897a3c20b79e3b28601ee43bcaefec827232': Doc change: add redirects for edu urls.
-rw-r--r--docs/html/_redirects.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index b3774e7..c70084c 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -339,3 +339,9 @@ redirects:
- from: /deviceart
to: http://developer.android.com/distribute/promote/device-art.html
+
+- from: /edu
+ to: /distribute/googleplay/edu/index.html
+
+- from: /edu/signup
+ to: https://services.google.com/fb/forms/playedu