summaryrefslogtreecommitdiffstats
path: root/docs/html/tools
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-02-25 23:32:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-25 23:32:51 +0000
commitbd409177ec6b422e18d9e0c94ffab86dfd368976 (patch)
treed19993fb829f61ccb78b4afdb04e3c7642c32f55 /docs/html/tools
parent81049aff4bad07427dc18543be1c759e16267a63 (diff)
parent1836eea08229dda72ff89d24f75f9f4948be957e (diff)
downloadframeworks_base-bd409177ec6b422e18d9e0c94ffab86dfd368976.zip
frameworks_base-bd409177ec6b422e18d9e0c94ffab86dfd368976.tar.gz
frameworks_base-bd409177ec6b422e18d9e0c94ffab86dfd368976.tar.bz2
am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
* commit '1836eea08229dda72ff89d24f75f9f4948be957e': docs: remove exploring sdk link
Diffstat (limited to 'docs/html/tools')
-rw-r--r--docs/html/tools/help/android.jd25
1 files changed, 13 insertions, 12 deletions
diff --git a/docs/html/tools/help/android.jd b/docs/html/tools/help/android.jd
index 19891e8..0d7d2aa 100644
--- a/docs/html/tools/help/android.jd
+++ b/docs/html/tools/help/android.jd
@@ -6,25 +6,26 @@ parent.link=index.html
<p>{@code android} is an important development tool that lets you:</p>
<ul>
- <li>Create, delete, and view Android Virtual Devices (AVDs). See <a href=
- "{@docRoot}tools/devices/managing-avds-cmdline.html">Managing AVDs from the Command
-Line</a>.</li>
+ <li>Create, delete, and view Android Virtual Devices (AVDs). See <a href=
+ "{@docRoot}tools/devices/managing-avds-cmdline.html">Managing AVDs from the Command Line</a>.</li>
- <li>Create and update Android projects. See <a href=
+ <li>Create and update Android projects. See <a href=
"{@docRoot}tools/projects/projects-cmdline.html">Managing Projects from
the Command Line</a>.</li>
- <li>Update your Android SDK with new platforms, add-ons, and documentation. See <a href=
- "{@docRoot}sdk/exploring.html">Exploring the SDK</a>.</li>
- </ul>If you are using Eclipse, the <code>android</code> tool's features are integrated
- into ADT, so you should not need to use this tool directly.
-
+ <li>Update your Android SDK with new platforms, add-ons, and documentation. See <a href=
+ "{@docRoot}tools/help/sdk-manager.html">SDK Manager</a>.</li>
+ </ul>
+
+<p>If you are using Android Studio or Eclipse, the <code>android</code> tool's features are
+integrated into the IDE, so you should not need to use this tool directly. </p>
+
<p class="note"><strong>Note:</strong> The documentation of options below is not exhaustive
and may be out of date. For the most current list of options, execute <code>android
--help</code>.</p>
-
-
-
+
+
+
<h2>Syntax</h2>
<pre>android [global options] action [action options]</pre>