summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkmccormick@google.com <kmccormick@google.com>2012-11-19 16:53:11 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-19 16:53:11 -0800
commit2f9947e9aa2b795dbc7db282a99a09410f1fadf2 (patch)
treef93066e844a9830b35bbb9f57c5aee169dcf3abb
parentf53c5f3683b71d232a78e04ea06649dd5e4bfee1 (diff)
parentddf10d44c12fbd8ffb115c847913296b455f412d (diff)
downloadbase-2f9947e9aa2b795dbc7db282a99a09410f1fadf2.tar.gz
am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
* commit 'ddf10d44c12fbd8ffb115c847913296b455f412d': Doc Update: Removed "no guaranteed delivery" line.
-rw-r--r--docs/html/guide/google/gcm/gcm.jd1
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/html/guide/google/gcm/gcm.jd b/docs/html/guide/google/gcm/gcm.jd
index 5d3ea563ca97..57d56b23fd33 100644
--- a/docs/html/guide/google/gcm/gcm.jd
+++ b/docs/html/guide/google/gcm/gcm.jd
@@ -80,7 +80,6 @@ Messaging (GCM):</p>
<ul>
<li>It allows 3rd-party application servers to send messages to
their Android applications.</li>
- <li>GCM makes no guarantees about delivery or the order of messages.</li>
<li>An Android application on an Android device doesn't need to be running to receive
messages. The system will wake up the Android application via Intent broadcast when the message arrives, as long as the application is set up with the proper
broadcast receiver and permissions.</li>