am d25c7917: Merge "docs: add redirect for l10n tutorial and fix a couple others" into jb-dev

* commit 'd25c7917b0f90a71a72842b17475744480d4096e':
  docs: add redirect for l10n tutorial and fix a couple others
This commit is contained in:
Scott Main
2012-07-25 14:39:58 -07:00
committed by Android Git Automerger

View File

@@ -369,14 +369,18 @@ redirects:
dst: /training/graphics/opengl/index.html dst: /training/graphics/opengl/index.html
type: permanent type: permanent
- src: /training/tutorials/views/hello-mapview.html - src: /resources/tutorials/views/hello-mapview.html
dst: https://developers.google.com/maps/documentation/android/hello-mapview dst: https://developers.google.com/maps/documentation/android/hello-mapview
type: permanent type: permanent
- src: /training/tutorials/views/.* - src: /resources/tutorials/views/.*
dst: /guide/topics/ui/declaring-layout.html#CommonLayouts dst: /guide/topics/ui/declaring-layout.html#CommonLayouts
type: permanent type: permanent
- src: /resources/tutorials/localization/.*
dst: /training/basics/supporting-devices/languages.html
type: permanent
- src: /resources/samples/.* - src: /resources/samples/.*
dst: /tools/samples/index.html dst: /tools/samples/index.html
type: permanent type: permanent