summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-12-03 13:01:19 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-03 13:01:19 -0800
commit2db56ddaee71f33f65fe246309531a66bf1d4374 (patch)
tree28dc75f0849c1ee7dd1b39bf01a7b309f9284328
parente38980a767ae8e13214f8ed00629ebb454157d46 (diff)
parent03c172e22287a9d1ced46ea70164399ef2fe4eda (diff)
downloadframeworks_base-2db56ddaee71f33f65fe246309531a66bf1d4374.zip
frameworks_base-2db56ddaee71f33f65fe246309531a66bf1d4374.tar.gz
frameworks_base-2db56ddaee71f33f65fe246309531a66bf1d4374.tar.bz2
Merge "docs: udpate for google service landing page and capitalize GPS in titles" into jb-mr1-dev
-rw-r--r--docs/html/google/google_toc.cs2
-rw-r--r--docs/html/google/index.jd8
-rw-r--r--docs/html/google/play-services/index.jd4
3 files changed, 7 insertions, 7 deletions
diff --git a/docs/html/google/google_toc.cs b/docs/html/google/google_toc.cs
index 22942dd..bb9cb50 100644
--- a/docs/html/google/google_toc.cs
+++ b/docs/html/google/google_toc.cs
@@ -15,7 +15,7 @@
<li class="nav-section">
<div class="nav-section-header"><a href="<?cs var:toroot ?>google/play-services/index.html">
- <span class="en">Google Play services</span></a>
+ <span class="en">Google Play Services</span></a>
</div>
<ul>
<li><a href="<?cs var:toroot?>google/play-services/setup.html">
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index e2f8f9d..49eac1c 100644
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -28,10 +28,10 @@ div.cell-icon img {
build new revenue streams, manage app distribution,
track app usage, and enhance your app with features such as maps, sign-in, and
cloud messaging.</p>
- <p>Because these services are offered directly by Google, they're not included in
- the Android platform. Some are provided by the Google Play
- service available on devices with Google Play,
- and others require a library added to your app.</p>
+ <p>Although these Google services are not included in the Android platform, they are
+ supported by most Android-powered devices. When using these services, you can
+ distribute your app to all device with Google Play running Android 2.2
+ or higher, and some services support even more devices.</p>
</div>
</div>
<div>&nbsp;</div>
diff --git a/docs/html/google/play-services/index.jd b/docs/html/google/play-services/index.jd
index 24ea34f..fae1e1a 100644
--- a/docs/html/google/play-services/index.jd
+++ b/docs/html/google/play-services/index.jd
@@ -1,4 +1,4 @@
-page.title=Google Play services
+page.title=Google Play Services
header.hide=1
@jd:body
@@ -10,7 +10,7 @@ header.hide=1
</div>
<div class="col-6">
- <h1 itemprop="name" style="margin-bottom:0;">Google Play services</h1>
+ <h1 itemprop="name" style="margin-bottom:0;">Google Play Services</h1>
<p itemprop="description">
</p>