diff options
| author | 2016-05-04 19:39:07 -0700 | |
|---|---|---|
| committer | 2016-05-04 19:46:50 -0700 | |
| commit | 0cb25d527f4ca81910feb106cca7ca156a34018b (patch) | |
| tree | 2da219b9af917fbe0d92df06f8f4f0f929ddcf07 | |
| parent | 084d99bfd4938689e6394a8f3bcb5d261b852f93 (diff) | |
| parent | c522dc65c419145119217bfa6bfae127afe0829d (diff) | |
resolve merge conflicts of c522dc6 to mnc-mr-docs
Change-Id: Ib4aedad4813a7973268239957b5103642941733d
| -rw-r--r-- | docs/html/_redirects.yaml | 14 |
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 |