summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-05-15 07:32:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-15 07:32:03 -0700
commit2694897a3c20b79e3b28601ee43bcaefec827232 (patch)
treefbee94bc874cab17d570f201b46a6150f64d5cdd
parent231e2474f283dc0a1962b45f1c16c5280a8937df (diff)
parent787cbb37d5cb2334af80d8da1b8fa4286e845eee (diff)
downloadframeworks_base-2694897a3c20b79e3b28601ee43bcaefec827232.zip
frameworks_base-2694897a3c20b79e3b28601ee43bcaefec827232.tar.gz
frameworks_base-2694897a3c20b79e3b28601ee43bcaefec827232.tar.bz2
am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '787cbb37d5cb2334af80d8da1b8fa4286e845eee': 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