diff options
| author | Joe Malin <jmalin@google.com> | 2012-09-26 12:48:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-26 12:48:58 -0700 |
| commit | fd3398c8bf25d8ec7ce813ebda431d67d734f268 (patch) | |
| tree | 85e093526f08a5fee459fec7ce0521fbe70330b0 | |
| parent | 832981c2135317d26bfaf2dc40acff30135542c3 (diff) | |
| parent | 44c564f251653286f3d2b8608ff5fccba39e831f (diff) | |
| download | frameworks_base-fd3398c8bf25d8ec7ce813ebda431d67d734f268.zip frameworks_base-fd3398c8bf25d8ec7ce813ebda431d67d734f268.tar.gz frameworks_base-fd3398c8bf25d8ec7ce813ebda431d67d734f268.tar.bz2 | |
am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
* commit '44c564f251653286f3d2b8608ff5fccba39e831f':
DOC CHANGE: Fix Google Play services page
| -rw-r--r-- | docs/html/guide/google/play/services.jd | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/docs/html/guide/google/play/services.jd b/docs/html/guide/google/play/services.jd index 519d78b..092642c 100644 --- a/docs/html/guide/google/play/services.jd +++ b/docs/html/guide/google/play/services.jd @@ -1,24 +1,25 @@ page.title=Google Play Services - @jd:body - -<p>Google Play services is a platform that is delivered through the Google Play Store that +<p> + Google Play services is a platform that is delivered through the Google Play Store that offers integration with Google products, such as Google+, into Android apps. The Google Play services framework consists of a services component - that runs on the device and a thin client library that you package with your app. </p> - - + that runs on the device and a thin client library that you package with your app. +</p> <div class="distribute-features col-13"> - <ul> - <li style="border-top: 1px solid #F80;"><h5>Easy Authentication</h5> Your app can leverage the user's - existing Google account on the device without having to go through - tedious authentication flows. A few clicks from the user and you're set! - <br /> <a href="https://developers.google.com/android/google-play-services">Learn more »</a> +<ul> + <li style="border-top: 1px solid #F80;"><h5>Easy Authentication</h5> + Your app can leverage the user's existing Google account on the device without having to go + through tedious authentication flows. A few clicks from the user and you're set! + <br/> + <a href="https://developers.google.com/android/google-play-services">Learn more »</a> </li> - <li style="border-top: 1px solid #F80;"><h5>Google+ Integration</h5> Google Play services makes it - easy for your app to integrate with Sign in with Google+, +1 button, and Google+ history. - <br /> <a href="https://developers.google.com/android/google-play-services">Learn more »</a> - </li> - </ul> - -</div>
\ No newline at end of file + <li style="border-top: 1px solid #F80;"><h5>Google+ Integration</h5> + Google Play services makes it easy for your app to integrate with Google+ sign-in and the +1 + button. + <br/> + <a href="https://developers.google.com/android/google-play-services">Learn more »</a> + </li> +</ul> + +</div> |