summaryrefslogtreecommitdiffstats
path: root/docs/html/tools
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-06-06 00:06:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-06 00:06:25 +0000
commitc37d84ac087717744e2c0df05a80fa829e6039a2 (patch)
tree53b9f9b992669f9a450759e0d1b5fa48ecdaa00a /docs/html/tools
parentc3b9156e284b689845e65880b60be2efc9fa4127 (diff)
parentedaf008c5e594d140aa430965a779f0b35280730 (diff)
downloadframeworks_base-c37d84ac087717744e2c0df05a80fa829e6039a2.zip
frameworks_base-c37d84ac087717744e2c0df05a80fa829e6039a2.tar.gz
frameworks_base-c37d84ac087717744e2c0df05a80fa829e6039a2.tar.bz2
am edaf008c: am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs
* commit 'edaf008c5e594d140aa430965a779f0b35280730': Revert "docs: studio 1.2.2.0 updates"
Diffstat (limited to 'docs/html/tools')
-rw-r--r--docs/html/tools/revisions/studio.jd18
1 files changed, 2 insertions, 16 deletions
diff --git a/docs/html/tools/revisions/studio.jd b/docs/html/tools/revisions/studio.jd
index b727d96..7138efe 100644
--- a/docs/html/tools/revisions/studio.jd
+++ b/docs/html/tools/revisions/studio.jd
@@ -43,24 +43,10 @@ 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.2.2</a> <em>(June 2015)</em>
- </p>
- <div class="toggle-content-toggleme">
- <p>Fixes and enhancements:</p>
- <ul>
- <li>Fixed build issues that were blocking builds from completing. </li>
- </ul>
- </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 v1.2.1</a> <em>(May 2015)</em>
</p>
<div class="toggle-content-toggleme">
- <p>Fixes and enhancements:</p>
+ <p>Various fixes and enhancements:</p>
<ul>
<li>Fixed minor performance and feature issues. </li>
</ul>
@@ -76,7 +62,7 @@ Android Studio, as denoted by revision number. </p>
</p>
<div class="toggle-content-toggleme">
- <p>Fixes and enhancements:</p>
+ <p>Various fixes and enhancements:</p>
<ul>
<li>Updated the Android runtime window to include the
<a href="{@docRoot}tools/studio/index.html#mem-cpu">Memory Monitor</a> tool