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 
Change-Id: Ib4aedad4813a7973268239957b5103642941733d
This commit is contained in:
Cheryl Potter
2016-05-04 19:39:07 -07:00
parent 084d99bfd4 c522dc65c4
commit 0cb25d527f
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