resolve merge conflicts of c522dc6 to mnc-mr-docs am: 0cb25d527f am: 34b9fa4d47 am: aa99efdb72

am: d2b11f93d8

* commit 'd2b11f93d826c912fccdd19f7df3444c5cc4bcb5':
  docs: Update help button redirects for new Android Monitor docs b/28592116

Change-Id: I3e7acb6d28cd1c5357fe0cd24fdfcf959a446729
This commit is contained in:
Cheryl Potter
2016-05-05 16:40:24 +00:00
committed by android-build-merger

View File

@@ -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