summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-05-15 07:37:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-15 07:37:59 -0700
commit1b173c6d5dceac14a42e6bf92980d0e247f5ccbc (patch)
treea173d3b56ece35d2ea8550abc22bee2fcd638039
parent7b2fba2f4a78fb42f42268fb899884b8fe4c5e1d (diff)
parent0f5d1391f511380382b2cb91cf356d80854230b5 (diff)
downloadframeworks_base-1b173c6d5dceac14a42e6bf92980d0e247f5ccbc.zip
frameworks_base-1b173c6d5dceac14a42e6bf92980d0e247f5ccbc.tar.gz
frameworks_base-1b173c6d5dceac14a42e6bf92980d0e247f5ccbc.tar.bz2
am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '0f5d1391f511380382b2cb91cf356d80854230b5': 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