resolve merge conflicts of c522dc6 to mnc-mr-docs

Change-Id: Ib4aedad4813a7973268239957b5103642941733d

diff --cc docs/html/_redirects.yaml
index 5188b90,e26bee0..8ecf22e
--- 1/docs/html/_redirects.yaml
--- 2/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@@ -800,48 -678,48 +800,48 @@@ redirects
  - from: /2016/03/first-preview-of-android-n-developer.html
    to: http://android-developers.blogspot.com/2016/03/first-preview-of-android-n-developer.html
  - from: /r/studio-ui/vector-asset-studio.html
 -  to: /tools/help/vector-asset-studio.html
 +  to: /studio/tools/help/vector-asset-studio.html
  - from: /r/studio-ui/image-asset-studio.html
 -  to: /tools/help/image-asset-studio.html
 +  to: /studio/tools/help/image-asset-studio.html
  - from: /r/studio-ui/project-structure.html
 -  to: /tools/help/project-mgmt.html
 +  to: /studio/tools/help/project-mgmt.html
  - from: /r/studio-ui/android-monitor.html
 -  to: /tools/help/android-monitor.html
 +  to: /studio/tools/help/android-monitor.html
  - from: /r/studio-ui/am-logcat.html
 -  to: /tools/help/am-logcat.html
 +  to: /studio/tools/help/am-logcat.html
  - from: /r/studio-ui/am-memory.html
 -  to: /tools/help/am-memory.html
 +  to: /studio/tools/help/am-memory.html
  - from: /r/studio-ui/am-cpu.html
 -  to: /tools/help/am-cpu.html
 +  to: /studio/tools/help/am-cpu.html
  - from: /r/studio-ui/am-gpu.html
 -  to: /tools/help/am-gpu.html
 +  to: /studio/tools/help/am-gpu.html
  - from: /r/studio-ui/am-network.html
 -  to: /tools/help/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: /tools/help/am-hprof.html
++  to: /studio/tools/help/am-hprof.html
  - from: /r/studio-ui/am-allocation.html
-   to: /studio/tools/help/am-memory.html
 -  to: /tools/help/am-allocation.html
++  to: /studio/tools/help/am-allocation.html
  - from: /r/studio-ui/am-methodtrace.html
-   to: /studio/tools/help/am-cpu.html
 -  to: /tools/help/am-methodtrace.html
++  to: /studio/tools/help/am-methodtrace.html
  - from: /r/studio-ui/am-sysinfo.html
-   to: /studio/tools/help/android-monitor.html
 -  to: /tools/help/am-sysinfo.html
++  to: /studio/tools/help/am-sysinfo.html
  - from: /r/studio-ui/am-screenshot.html
-   to: /studio/tools/help/android-monitor.html
 -  to: /tools/help/am-screenshot.html
++  to: /studio/tools/help/am-screenshot.html
  - from: /r/studio-ui/am-video.html
-   to: /studio/tools/help/android-monitor.html
 -  to: /tools/help/am-video.html
++  to: /studio/tools/help/am-video.html
  - from: /r/studio-ui/avd-manager.html
-   to: /studio/tools/help/avd-manager.html
 -  to: /tools/devices/managing-avds.html
++  to: /studio/tools/devices/managing-avds.html
  - from: /r/studio-ui/rundebugconfig.html
 -  to: /tools/devices/emulator.html
 +  to: /studio/tools/devices/emulator.html
  - from: /r/studio-ui/devicechooser.html
 -  to: /tools/devices/emulator.html
 +  to: /studio/tools/devices/emulator.html
  - from: /r/studio-ui/virtualdeviceconfig.html
 -  to: /tools/devices/emulator.html
 +  to: /studio/tools/devices/emulator.html
  - from: /r/studio-ui/emulator.html
 -  to: /tools/devices/emulator.html
 +  to: /studio/tools/devices/emulator.html
  - from: /r/studio-ui/instant-run.html
 -  to: /tools/building/building-studio.html#instant-run
 -- from: /reference/org/apache/http/.*
 +  to: /studio/tools/building/building-studio.html#instant-run
 +- from: /reference/org/apache/http/...
    to: /about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client
  - from: /shareables/
    to: https://commondatastorage.googleapis.com/androiddevelopers/shareables/