summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joe Fernandez <joefernandez@google.com> 2014-10-24 06:06:00 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-10-24 06:06:01 +0000
commit0e893eb7ac1985a02d61525a5e6076d45a1e8c7d (patch)
tree9d986c148014ea2806e8347869b65fb677aa809b
parent1e5bb861265072b9af555d09202e49cb38a3c4f1 (diff)
parent26f8ed362611ef07c90cd649ea2988a445074152 (diff)
Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
-rw-r--r--docs/html/tools/devices/managing-avds.jd6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/html/tools/devices/managing-avds.jd b/docs/html/tools/devices/managing-avds.jd
index 10633d264fca..d3bbfdcd2052 100644
--- a/docs/html/tools/devices/managing-avds.jd
+++ b/docs/html/tools/devices/managing-avds.jd
@@ -31,6 +31,12 @@ parent.link=index.html
<p>From the main screen, you can create, delete, repair and start AVDs as well as see the details
of each AVD. </p>
+
+ <p class="note"><strong>Note:</strong> The emulator system images include experimental
+64-bit system images along with standard 32-bit system images. The 64-bit system images
+require the Intel x86 Emulator Accelerator (HAXM) Rev.5 which can be downloaded from the
+<a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a> <em>Extras</em> folder.
+ </p>
<h2 id="createavd">Creating an AVD</h2>