diff options
author | Rich Slogar <rslogar@google.com> | 2014-10-02 17:31:04 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-02 17:31:05 +0000 |
commit | c074c3a4074791ae1270e3177e2299f31b9bb5a1 (patch) | |
tree | e40a6ef6fba9386f0d00653a14ae1c2b2f37df91 /docs/html/preview | |
parent | a1572ffc6b8df1f0da637fdb93b949322fcb3637 (diff) | |
parent | f34d0e69033165b7a6e9c73b99f4ef6ac36b3896 (diff) | |
download | frameworks_base-c074c3a4074791ae1270e3177e2299f31b9bb5a1.zip frameworks_base-c074c3a4074791ae1270e3177e2299f31b9bb5a1.tar.gz frameworks_base-c074c3a4074791ae1270e3177e2299f31b9bb5a1.tar.bz2 |
Merge "docs: Update for Android 23.0.4" into klp-modular-docs
Diffstat (limited to 'docs/html/preview')
-rw-r--r-- | docs/html/preview/setup-sdk.jd | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd index af466ab..a05baa7 100644 --- a/docs/html/preview/setup-sdk.jd +++ b/docs/html/preview/setup-sdk.jd @@ -202,10 +202,16 @@ to flash the following devices: <li>Nexus 7 Wi-Fi (version 2, released in 2013)</li> </ul> -<p>In addition, you also get the emulator system images, which includes +<p>In addition, you also get the emulator system images, which include experimental 64-bit system images along with standard 32-bit system images. </p> +<p class="note"><strong>Note:</strong> 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> + + <h3 id="installImage">Install the L Preview System Image</h3> <p class="warning"><b>Warning:</b> This is a preview version of the Android @@ -218,6 +224,7 @@ can cause your phone and installed services and applications to stop working. </p> + <ol> <li>Download and uncompress the Android Developer Preview package. <table style="width:860px"> @@ -361,4 +368,4 @@ sure that you theme extends the material theme:</p> } }); -</script>
\ No newline at end of file +</script> |