summaryrefslogtreecommitdiffstats
path: root/docs/html/reference/com/google/android
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-05-11 23:18:35 -0700
committerDirk Dougherty <ddougherty@google.com>2013-05-11 23:18:35 -0700
commit730c32c5acede2a1e56f904bd8b66191c4f53b1b (patch)
tree17b12f8293c0463257e7c1d2f6c2a4f241dba8c9 /docs/html/reference/com/google/android
parent4da9c11b2758d55c67f7a24c3eb519c36497ba5d (diff)
downloadframeworks_base-730c32c5acede2a1e56f904bd8b66191c4f53b1b.zip
frameworks_base-730c32c5acede2a1e56f904bd8b66191c4f53b1b.tar.gz
frameworks_base-730c32c5acede2a1e56f904bd8b66191c4f53b1b.tar.bz2
Doc change: update gps 3.1 reference docs.
Bug: 8918191 Change-Id: I3b74aad404eee7420673e04d13a2eb31b60ec833
Diffstat (limited to 'docs/html/reference/com/google/android')
-rw-r--r--docs/html/reference/com/google/android/gms/gcm/GoogleCloudMessaging.html6
-rw-r--r--docs/html/reference/com/google/android/gms/gcm/package-summary.html2
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/html/reference/com/google/android/gms/gcm/GoogleCloudMessaging.html b/docs/html/reference/com/google/android/gms/gcm/GoogleCloudMessaging.html
index c67c8d6..706d8b3 100644
--- a/docs/html/reference/com/google/android/gms/gcm/GoogleCloudMessaging.html
+++ b/docs/html/reference/com/google/android/gms/gcm/GoogleCloudMessaging.html
@@ -701,9 +701,9 @@ Summary:
<h2>Class Overview</h2>
-<p itemprop="articleBody"><p>Interface for Google Cloud Messaging for Android.
+<p itemprop="articleBody"><p>Google Cloud Messaging for Android.
- <p>This class requires Google Play Services version 3.1.
+ <p>This class requires Google Play services version 3.1 or higher.
<p>In order to receive GCM messages you need to declare a permission and a BroadcastReceiver
in your manifest. This is a backward-compatible subset of what was required in previous
@@ -717,7 +717,7 @@ Summary:
order to wake up the application.
<p>The <code>com.google.android.c2dm.permission.SEND</code> permission is held by
- Google Play Services.
+ Google Play services.
This prevents other code from invoking the broadcast receiver.
Here is an excerpt from the manifest:
diff --git a/docs/html/reference/com/google/android/gms/gcm/package-summary.html b/docs/html/reference/com/google/android/gms/gcm/package-summary.html
index 24e5eb7..78ec581 100644
--- a/docs/html/reference/com/google/android/gms/gcm/package-summary.html
+++ b/docs/html/reference/com/google/android/gms/gcm/package-summary.html
@@ -627,7 +627,7 @@ onkeyup="return search_changed(event, false, '/')" />
<table class="jd-sumtable-expando">
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="/reference/com/google/android/gms/gcm/GoogleCloudMessaging.html">GoogleCloudMessaging</a></td>
- <td class="jd-descrcol" width="100%"><p>Interface for Google Cloud Messaging for Android.&nbsp;</td>
+ <td class="jd-descrcol" width="100%"><p>Google Cloud Messaging for Android.&nbsp;</td>
</tr>
</table>
</div>