summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2014-10-24 22:37:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-24 22:37:16 +0000
commitabb8ea3d4be376b0816b791c1afd3cc78300e9d4 (patch)
treeb2d049736fa5092db80861eb62d5e3ca30ce5d48 /docs
parent60144a7a06d818e7ef22d08722be67c602aeb088 (diff)
parent90f734eb180619eb8ffd2e30580f72b500184f8b (diff)
downloadframeworks_base-abb8ea3d4be376b0816b791c1afd3cc78300e9d4.zip
frameworks_base-abb8ea3d4be376b0816b791c1afd3cc78300e9d4.tar.gz
frameworks_base-abb8ea3d4be376b0816b791c1afd3cc78300e9d4.tar.bz2
am 90f734eb: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '90f734eb180619eb8ffd2e30580f72b500184f8b': docs:Added 64-bit image note from Preview page
Diffstat (limited to '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 10633d2..d3bbfdc 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>