diff options
author | Joe Fernandez <joefernandez@google.com> | 2014-12-08 18:59:34 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-08 18:59:34 +0000 |
commit | cdcabe4cd6510e1009c01f5266da74b0ae1f1b32 (patch) | |
tree | 7082b095c32f652417d759e93e7b4e8ad27f056f /docs/html/tools | |
parent | 1dfaa3a02b5b377a3dacdd97e24b8559dc1aae6c (diff) | |
parent | d6a66d841eef4fb983cc539c4ca050060ecf066c (diff) | |
download | frameworks_base-cdcabe4cd6510e1009c01f5266da74b0ae1f1b32.zip frameworks_base-cdcabe4cd6510e1009c01f5266da74b0ae1f1b32.tar.gz frameworks_base-cdcabe4cd6510e1009c01f5266da74b0ae1f1b32.tar.bz2 |
am d6a66d84: am 6ecc6d59: am 88b8b4a5: Merge "docs: studio revision update 1.0" into lmp-docs
* commit 'd6a66d841eef4fb983cc539c4ca050060ecf066c':
docs: studio revision update 1.0
Diffstat (limited to 'docs/html/tools')
-rw-r--r-- | docs/html/tools/revisions/studio.jd | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/docs/html/tools/revisions/studio.jd b/docs/html/tools/revisions/studio.jd index fe3b99b..523929d 100644 --- a/docs/html/tools/revisions/studio.jd +++ b/docs/html/tools/revisions/studio.jd @@ -26,8 +26,8 @@ everything you need to begin developing Android apps:</p> <li>A version of the Android system image for the emulator</li> </ul> -<p>For an introduction to Android Studio, make sure to read -<a href="{@docRoot}tools/studio/basics.html">Android Studio Basics</a>.</p> +<p>For an introduction to Android Studio, make sure to read the +<a href="{@docRoot}tools/studio/index.html">Android Studio</a> guide.</p> <p>Periodic updates are pushed to Android Studio without requiring you to update from here. To manually check for updates, select <strong>Help > Check for updates</strong> (on Mac, select @@ -39,10 +39,21 @@ manually check for updates, select <strong>Help > Check for updates</strong> (on <p>The sections below provide notes about successive releases of Android Studio, as denoted by revision number. </p> - <div class="toggle-content opened"> <p><a href="#" onclick="return toggleContent(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" + alt=""/>Android Studio v1.0</a> <em>(December 2014)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>Initial release of Android Studio.</p> + </div> +</div> + + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" alt=""/>Android Studio v0.8.14</a> <em>(October 2014)</em> </p> |