Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34b9fa4d authored by Cheryl Potter's avatar Cheryl Potter Committed by android-build-merger
Browse files

resolve merge conflicts of c522dc65 to mnc-mr-docs

am: 0cb25d52

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

Change-Id: I24ec45420bab5a346f4d86b7a1a09ed9a3dec67f
parents d9092978 0cb25d52
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -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