summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2014-12-10 19:47:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-10 19:47:11 +0000
commitefab8b6fd50e2e4ad3adb03c4bca2bc531ae5d42 (patch)
treecfe377f228b83c31b751154fae83c92bab20e61b
parent9727d1910052e600ebcf417c9fe55436ecf2c9de (diff)
parentbdd6aabd1fd98762b22bb347d24c99e2c388d166 (diff)
downloadframeworks_base-efab8b6fd50e2e4ad3adb03c4bca2bc531ae5d42.zip
frameworks_base-efab8b6fd50e2e4ad3adb03c4bca2bc531ae5d42.tar.gz
frameworks_base-efab8b6fd50e2e4ad3adb03c4bca2bc531ae5d42.tar.bz2
am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
* commit 'bdd6aabd1fd98762b22bb347d24c99e2c388d166': docs: update debug menu for debugging-studio
-rw-r--r--docs/html/tools/tools_toc.cs10
1 files changed, 1 insertions, 9 deletions
diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs
index cb6a1de..9437c1b 100644
--- a/docs/html/tools/tools_toc.cs
+++ b/docs/html/tools/tools_toc.cs
@@ -122,7 +122,7 @@
<li class="nav-section">
<div class="nav-section-header"><a href="<?cs var:toroot ?>tools/debugging/index.html"><span class="en">Debugging</span></a></div>
<ul>
- <li><a href="<?cs var:toroot ?>tools/debugging/debugging-projects.html"><span class="en">From Eclipse with ADT</span></a></li>
+ <li><a href="<?cs var:toroot ?>tools/debugging/debugging-studio.html"><span class="en">From Android Studio</span></a></li>
<li><a href="<?cs var:toroot ?>tools/debugging/debugging-projects-cmdline.html"><span class="en">From Other IDEs</span></a></li>
<li><a href="<?cs var:toroot ?>tools/debugging/ddms.html"><span class="en">Using DDMS</span></a></li>
<li><a href="<?cs var:toroot ?>tools/debugging/debugging-log.html"><span class="en">Reading and Writing Logs</span></a></li>
@@ -145,14 +145,6 @@
</ul>
</li>
- <li class="nav-section">
- <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/support-library/index.html"><span
-class="en">Support Library</span></a></div>
- <ul>
- <li><a href="<?cs var:toroot ?>tools/support-library/features.html">Features</a></li>
- <li><a href="<?cs var:toroot ?>tools/support-library/setup.html">Setup</a></li>
- </ul>
- </li>
<li class="nav-section">
<div class="nav-section-header"><a href="<?cs var:toroot ?>tools/help/index.html"><span