Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of c522dc6 to mnc-mr-docs

Browse Source 
am: 0cb25d527f

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

Change-Id: I24ec45420bab5a346f4d86b7a1a09ed9a3dec67f
This commit is contained in:
Cheryl Potter
2016-05-05 16:31:08 +00:00
committed by android-build-merger
parent d9092978cd 0cb25d527f
commit 34b9fa4d47
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/html/_redirects.yaml
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