summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-04-29 11:08:25 -0700
committerRich Slogar <rslogar@google.com>2015-04-29 13:29:15 -0700
commit20d7db9b76404616ac1541c30080f5c5ab8add1c (patch)
treed6b824a39a8cbe245c66f751d6b959202e6ce0ae /docs/html
parent02e4f2fbe6e0511789d42d5942548158d2dd154f (diff)
downloadframeworks_base-20d7db9b76404616ac1541c30080f5c5ab8add1c.zip
frameworks_base-20d7db9b76404616ac1541c30080f5c5ab8add1c.tar.gz
frameworks_base-20d7db9b76404616ac1541c30080f5c5ab8add1c.tar.bz2
docs: emulator updates
b/20427070 Change-Id: Ie57ec6a0a0fca2dff13ea3b343f9abfa13cdf8d8
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/tools/devices/index.jd16
-rw-r--r--docs/html/tools/devices/managing-avds-cmdline.jd4
2 files changed, 10 insertions, 10 deletions
diff --git a/docs/html/tools/devices/index.jd b/docs/html/tools/devices/index.jd
index 1ea4c47..6263c8b 100644
--- a/docs/html/tools/devices/index.jd
+++ b/docs/html/tools/devices/index.jd
@@ -5,16 +5,16 @@ page.title=Managing Virtual Devices
<p>An Android Virtual Device (AVD) is an emulator configuration that lets you model an actual
device by defining hardware and software options to be emulated by the Android Emulator.</p>
- <p>The easiest way to create an AVD is to use the graphical <a href=
- "{@docRoot}tools/devices/managing-avds.html">AVD Manager</a>, which you launch
- from Eclipse by clicking <strong>Window &gt; AVD Manager</strong>. You can also start the AVD
-Manager from the command line by calling the <code>android</code> tool with the <code>avd</code>
-options, from the <strong>&lt;sdk>/tools/</strong> directory.</p>
+ <p>The easiest way to create an AVD is to use the graphical
+ <a href="{@docRoot}tools/devices/managing-avds.html">AVD Manager</a>, which you launch
+ from Android Studio by clicking <strong>Tools &gt; Android &gt; AVD Manager</strong>. You can
+ also start the AVD Manager from the command line by calling the <code>android</code> tool with
+ the <code>avd</code> options, from the <strong>&lt;sdk>/tools/</strong> directory.</p>
<p>You can also create AVDs on the command line by passing the <code>android</code> tool options.
- For more information on how to create AVDs in this manner, see <a href=
- "{@docRoot}tools/devices/managing-avds-cmdline.html">Managing Virtual
- Devices from the Command Line</a>.</p>
+ For more information on how to create AVDs in this manner, see
+ <a href="{@docRoot}tools/devices/managing-avds-cmdline.html">Managing Virtual Devices from the
+ Command Line</a>.</p>
<p>An AVD consists of:</p>
diff --git a/docs/html/tools/devices/managing-avds-cmdline.jd b/docs/html/tools/devices/managing-avds-cmdline.jd
index ba353c1..c16b1f8 100644
--- a/docs/html/tools/devices/managing-avds-cmdline.jd
+++ b/docs/html/tools/devices/managing-avds-cmdline.jd
@@ -84,8 +84,8 @@ id: 5 or "android-9"
<h2 id="AVDCmdLine">Creating AVDs</h2>
-<p>In addition to creating AVDs with the
-<a href="{@docRoot}tools/devices/managing-avds-cmdline.html">AVD Manager user interface</a>,
+<p>In addition to creating AVDs with the
+<a href="{@docRoot}tools/help/avd-manager.html">AVD Manager user interface</a>,
you can also create them by passing in command line arguments to the <code>android</code> tool.
</p>