summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Cheryl Potter <cherylpotter@google.com> 2016-05-05 16:34:12 +0000
committer android-build-merger <android-build-merger@google.com> 2016-05-05 16:34:12 +0000
commitaa99efdb7290fa3dfdb06ebf756e5e6fb9ae446c (patch)
treec1ca09313dd3445eb36be26ff9fa66a19e56b881
parent35515f4fdb9e0c5ae4618a8b55addd2e24cf6983 (diff)
parent34b9fa4d471a0bf2b6cf2dc8c342468d48c9fefa (diff)
resolve merge conflicts of c522dc6 to mnc-mr-docs am: 0cb25d527f
am: 34b9fa4d47 * commit '34b9fa4d471a0bf2b6cf2dc8c342468d48c9fefa': docs: Update help button redirects for new Android Monitor docs b/28592116 Change-Id: I24359c6e2eea97383309610f60d83286a0663c7b
-rw-r--r--docs/html/_redirects.yaml14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index 5188b900aa84..8ecf22ecfe2a 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -818,19 +818,19 @@ redirects:
- from: /r/studio-ui/am-network.html
to: /studio/tools/help/am-network.html
- from: /r/studio-ui/am-hprof.html
- to: /studio/tools/help/am-memory.html
+ to: /studio/tools/help/am-hprof.html
- from: /r/studio-ui/am-allocation.html
- to: /studio/tools/help/am-memory.html
+ to: /studio/tools/help/am-allocation.html
- from: /r/studio-ui/am-methodtrace.html
- to: /studio/tools/help/am-cpu.html
+ to: /studio/tools/help/am-methodtrace.html
- from: /r/studio-ui/am-sysinfo.html
- to: /studio/tools/help/android-monitor.html
+ to: /studio/tools/help/am-sysinfo.html
- from: /r/studio-ui/am-screenshot.html
- to: /studio/tools/help/android-monitor.html
+ to: /studio/tools/help/am-screenshot.html
- from: /r/studio-ui/am-video.html
- to: /studio/tools/help/android-monitor.html
+ to: /studio/tools/help/am-video.html
- from: /r/studio-ui/avd-manager.html
- to: /studio/tools/help/avd-manager.html
+ to: /studio/tools/devices/managing-avds.html
- from: /r/studio-ui/rundebugconfig.html
to: /studio/tools/devices/emulator.html
- from: /r/studio-ui/devicechooser.html