summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2014-12-12 04:21:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-12 04:21:22 +0000
commite5624ae02be7bede0fda7ced5038b0f0d50a559f (patch)
tree9b790c77cde32099fcd77375116ac4d867e7be00 /docs
parent3e42bb70e4c0f358d08142e2f7f40150ff4f8cae (diff)
parent11fc651aefbcdebc646f347e4981204d3ef7b0a7 (diff)
downloadframeworks_base-e5624ae02be7bede0fda7ced5038b0f0d50a559f.zip
frameworks_base-e5624ae02be7bede0fda7ced5038b0f0d50a559f.tar.gz
frameworks_base-e5624ae02be7bede0fda7ced5038b0f0d50a559f.tar.bz2
am 11fc651a: am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs automerge: cc08e61
* commit '11fc651aefbcdebc646f347e4981204d3ef7b0a7': docs: platform updates for api 21
Diffstat (limited to 'docs')
-rw-r--r--docs/html/tools/revisions/platforms.jd16
1 files changed, 16 insertions, 0 deletions
diff --git a/docs/html/tools/revisions/platforms.jd b/docs/html/tools/revisions/platforms.jd
index 75b3cef..a73be5e 100644
--- a/docs/html/tools/revisions/platforms.jd
+++ b/docs/html/tools/revisions/platforms.jd
@@ -59,6 +59,22 @@ packages may not be available for download.</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="" />Revision 2</a> <em>(December 2014)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+
+ <p>Updated layouts in the Support Library and fixed various issues.</p>
+ <p>Dependencies:</p>
+ <ul>
+ <li>Android SDK Platform-tools r21 or higher is required.</li>
+ <li>Android SDK Tools 23.0.5 or higher is required.</li>
+ </ul>
+ </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="" />Revision 1</a> <em>(October 2014)</em>
</p>