summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-06-28 10:37:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-28 10:37:41 -0700
commitc4f7873cada2fca2d1d3390b113ca46c71dd86ad (patch)
tree10908809e48df861c609e333d77b7f997cf117e8 /docs/html
parentd91cce8558d09295746588fa13a2cbb0f3e7ab59 (diff)
parentfb2ed9869b1b0d76dfd013605214911d7e381f50 (diff)
downloadframeworks_base-c4f7873cada2fca2d1d3390b113ca46c71dd86ad.zip
frameworks_base-c4f7873cada2fca2d1d3390b113ca46c71dd86ad.tar.gz
frameworks_base-c4f7873cada2fca2d1d3390b113ca46c71dd86ad.tar.bz2
Merge "docs: fix g+ gms description" into jb-dev
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/guide/google/play/services.jd5
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/html/guide/google/play/services.jd b/docs/html/guide/google/play/services.jd
index e88d31f..519d78b 100644
--- a/docs/html/guide/google/play/services.jd
+++ b/docs/html/guide/google/play/services.jd
@@ -15,9 +15,8 @@ page.title=Google Play Services
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 &raquo;</a>
</li>
- <li style="border-top: 1px solid #F80;"><h5>Google+ Integration</h5>Google Play Services lets you
- read from and write to your user's Google+ activity stream, giving your
- app an easy way to integrate with Google+.
+ <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 &raquo;</a>
</li>
</ul>