Merge commit 'd297be2136209cab4edbcf8879520f65fb564103' into HEAD

scripts/app_engine_server/app.yaml.production

@@ -0,0 +1,16 @@
+application: androiddevdocs
+version: 1
+runtime: python
+api_version: 1
+
+handlers:
+- url: /gae_shell/static
+  static_dir: gae_shell/static
+  expiration: 1d
+
+- url: /gae_shell/.*
+  script: /gae_shell/shell.py
+  login: admin
+
+- url: .*
+  script: main.py

scripts/app_engine_server/redirects.yaml

@@ -303,6 +303,10 @@ redirects:
 - src: /guide/appendix/install-location.html
   dst: /guide/topics/data/install-location.html
   type: permanent
+
+- src: /guide/appendix/g-app-intents.html
+  dst: /guide/components/intents-common.html
+  type: permanent
   comment: Redirect to new location
 
 # new one
@@ -547,7 +551,11 @@ redirects:
   type: permanent
 
 - src: /resources/samples/.*
-  dst: /tools/samples/index.html
+  dst: /samples/index.html
+  type: permanent
+
+- src: /tools/samples/index.html
+  dst: /samples/index.html
   type: permanent
   comment: Redirect to new location
 
@@ -561,12 +569,6 @@ redirects:
   type: permanent
   comment: Redirect to new location
 
-- src: /guide/index.html
-  dst: /guide/components/index.html
-  type: permanent
-  comment: Redirect to new location
-
-
 
 # ------------------- TRAINING -------------------