commit c03a39ab74f5d4c6f62d5323d4049855758fdfcf
author Rich Slogar <rslogar@google.com> Mon May 18 17:12:46 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 18 17:12:47 2015 +0000
tree 1fb54836be6462205d7ab8ed05d6ddf4324bf81d
parent f5d6156ce8e56eb92abcf046fd8ff5a9647d38ae
parent 20d7db9b76404616ac1541c30080f5c5ab8add1c

Merge "docs: emulator updates" into lmp-docs

docs/html/tools/devices/index.jd

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 @@
  <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>
 

docs/html/tools/devices/managing-avds-cmdline.jd

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 @@
 
 <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>