diff options
author | Ricardo Cervera <rcervera@google.com> | 2014-02-12 22:08:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-12 22:08:27 +0000 |
commit | 49968bb559cefbd96ce84b593b11203bddfa134a (patch) | |
tree | de649f2f80f13277e6b9f60609efac4c5378ff34 | |
parent | 8dfda07dd410c1776c6b0d373229fe77c76f8cfc (diff) | |
parent | 6960ad58ac989ce6ab2b5d34159ceeb1093b0e39 (diff) | |
download | frameworks_base-49968bb559cefbd96ce84b593b11203bddfa134a.zip frameworks_base-49968bb559cefbd96ce84b593b11203bddfa134a.tar.gz frameworks_base-49968bb559cefbd96ce84b593b11203bddfa134a.tar.bz2 |
am 6960ad58: am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '6960ad58ac989ce6ab2b5d34159ceeb1093b0e39':
docs: Added Revision 3 of Google APIs System Image.
-rw-r--r-- | docs/html/tools/revisions/platforms.jd | 21 |
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> |