summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-02-05 14:15:57 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-05 14:15:57 -0800
commit2ef571bced92cfca953198c7fb681c9e8ec1c463 (patch)
tree1648f8f2f7d8701de603429dc820ff82a0805467 /scripts
parent1657a0d586990d50c2fc8e8497d22b2db8ada13b (diff)
parentc82865621bb29c9fdf0d7f25b2a492b36adef927 (diff)
downloadandroid_development-2ef571bced92cfca953198c7fb681c9e8ec1c463.tar.gz
android_development-2ef571bced92cfca953198c7fb681c9e8ec1c463.tar.bz2
android_development-2ef571bced92cfca953198c7fb681c9e8ec1c463.zip
am c8286562: am 24600336: am 64f03f37: am 451d3b83: Merge "Add redirect for removed file." into jb-mr1-dev
# Via Android Git Automerger (3) and others * commit 'c82865621bb29c9fdf0d7f25b2a492b36adef927': Add redirect for removed file.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/app_engine_server/redirects.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/app_engine_server/redirects.yaml b/scripts/app_engine_server/redirects.yaml
index 8a5ac27d3..b7c28f268 100644
--- a/scripts/app_engine_server/redirects.yaml
+++ b/scripts/app_engine_server/redirects.yaml
@@ -283,6 +283,11 @@ redirects:
type: permanent
comment: Redirect to new location
+- src: /guide/topics/graphics/renderscript.html
+ dst: /guide/topics/renderscript/index.html
+ type: permanent
+ comment: Redirect to new location
+
- src: /guide/topics/location/obtaining-user-location.html
dst: /guide/topics/location/strategies.html
type: permanent
@@ -584,4 +589,4 @@ redirects:
- src: /deviceart
dst: http://developer.android.com/distribute/promote/device-art.html
- type: permanent \ No newline at end of file
+ type: permanent