summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-02-12 23:01:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-12 23:01:56 +0000
commitb134b0ae45ef7520c026cc740ab4422ff9c2b95c (patch)
treeeda0d0ccdfdc8ac393ca4fc3de0747c3fa643cb5
parent4cfd54eaf0106373e1fea75a1e33ac460cf7c23d (diff)
parent6bc06c815f47021e49e191740caeb8ee2c846c5a (diff)
downloadframeworks_base-b134b0ae45ef7520c026cc740ab4422ff9c2b95c.zip
frameworks_base-b134b0ae45ef7520c026cc740ab4422ff9c2b95c.tar.gz
frameworks_base-b134b0ae45ef7520c026cc740ab4422ff9c2b95c.tar.bz2
am 6bc06c81: am 49968bb5: am 6960ad58: am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '6bc06c815f47021e49e191740caeb8ee2c846c5a': docs: Added Revision 3 of Google APIs System Image.
-rw-r--r--docs/html/tools/revisions/platforms.jd21
1 files changed, 18 insertions, 3 deletions
diff --git a/docs/html/tools/revisions/platforms.jd b/docs/html/tools/revisions/platforms.jd
index c5d1ef6..99a271f 100644
--- a/docs/html/tools/revisions/platforms.jd
+++ b/docs/html/tools/revisions/platforms.jd
@@ -87,18 +87,19 @@ class="toggle-content-img" alt="" />Revision 1</a> <em>(October 2013)</em>
</div>
+
<h3 id="gsi-4.4">Google APIs System Image</h3>
<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 2013)</em>
+class="toggle-content-img" alt="" />Revision 3</a> <em>(February 2014)</em>
</p>
<div class="toggle-content-toggleme">
- <p>Maintenance release. This release includes
- <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 4.0.33,
+ <p>This release includes
+ <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 4.2.42,
allowing you to test your application in an emulator using the latest Google Play services.</p>
</div>
@@ -107,6 +108,20 @@ class="toggle-content-img" alt="" />Revision 2</a> <em>(December 2013)</em>
<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 2013)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+
+ <p>This release includes
+ <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 4.0.33.</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="" />Revision 1</a> <em>(October 2013)</em>
</p>