summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-03-03 03:27:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-03 03:27:05 +0000
commit48b426865e6690b2bf6ba997f6a833a540babeaf (patch)
treea2dd22734657d7a16f7ea4498264e39aab84f519 /docs
parentc76086cd1c01b83da88015307265701f871a8313 (diff)
parent6717c36f4a8e74b13765c57a6aa01d7a2d0a7a6b (diff)
downloadframeworks_base-48b426865e6690b2bf6ba997f6a833a540babeaf.zip
frameworks_base-48b426865e6690b2bf6ba997f6a833a540babeaf.tar.gz
frameworks_base-48b426865e6690b2bf6ba997f6a833a540babeaf.tar.bz2
am 6717c36f: am 522f5aa5: am ad334de5: am e0ce0f2c: docs: platform revisions 5.1
* commit '6717c36f4a8e74b13765c57a6aa01d7a2d0a7a6b': docs: platform revisions 5.1
Diffstat (limited to 'docs')
-rw-r--r--docs/html/tools/revisions/platforms.jd28
1 files changed, 26 insertions, 2 deletions
diff --git a/docs/html/tools/revisions/platforms.jd b/docs/html/tools/revisions/platforms.jd
index a73be5e..8a31beb 100644
--- a/docs/html/tools/revisions/platforms.jd
+++ b/docs/html/tools/revisions/platforms.jd
@@ -54,11 +54,35 @@ most recent release and restart the SDK Manager. If you do not, the latest Andro
packages may not be available for download.</p>
-<h2 id="5.0">Android 5.0</h2>
+<h2 id="5.1">Android 5.1</h2>
<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 1</a> <em>(March 2015)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+
+ <p>Initial release for Android 5.1 (API level 22).</p>
+ <p>Also see the
+ <a href="{@docRoot}about/versions/android-5.1.html">Android 5.1 APIs overview</a>.</p>
+ <p>Dependencies:</p>
+ <ul>
+ <li>Android SDK Platform-tools r22 or higher is required.</li>
+ <li>Android SDK Tools 23.0.5 or higher is required.</li>
+ </ul>
+ </div>
+
+</div>
+
+
+
+<h2 id="5.0">Android 5.0</h2>
+
+<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 2</a> <em>(December 2014)</em>
</p>
@@ -94,7 +118,7 @@ class="toggle-content-img" alt="" />Revision 1</a> <em>(October 2014)</em>
<p>The platform includes the following new device definitions for use in creating
Android Virtual Devices in the <a href="{@docRoot}tools/help/avd-manager.html">AVD Manager</a>:</p>
-
+
<ul>
<li>Nexus 6 (5.96", 1440 x 2560, Normal 560dpi screen) </li>
<li>Nexus 9 (8.9", 2048 x 1536, X-Large xhdpi screen) </li>