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

Commit 0cb25d52 authored by Cheryl Potter's avatar Cheryl Potter
Browse files

resolve merge conflicts of c522dc65 to mnc-mr-docs 

Change-Id: Ib4aedad4813a7973268239957b5103642941733d
parents 084d99bf c522dc65

docs/html/_redirects.yaml

+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