summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-05-15 07:41:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-15 07:41:51 -0700
commitc979d9c0084d8fb7e3f2e480acae2da22cf2e5cf (patch)
treee40b36206b7515f28d7de3b91733f9b2e1fb45f4
parent26701f2b50a9cf925e52c1f8f97e8852dd6a3e10 (diff)
parentf4dfad6a89831d6b1780513cf4ea28a5485b19b9 (diff)
downloadframeworks_base-c979d9c0084d8fb7e3f2e480acae2da22cf2e5cf.zip
frameworks_base-c979d9c0084d8fb7e3f2e480acae2da22cf2e5cf.tar.gz
frameworks_base-c979d9c0084d8fb7e3f2e480acae2da22cf2e5cf.tar.bz2
am f4dfad6a: 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 'f4dfad6a89831d6b1780513cf4ea28a5485b19b9': 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