summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorkmccormick@google.com <kmccormick@google.com>2012-11-19 16:58:10 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-19 16:58:10 -0800
commit55340e51343a248260f89e953476b1c6e731842a (patch)
tree8d88cced197976f324673ff972937c4431917f8a /docs/html
parente9812bae0e0ce08bd232dc2371fdb959e4f7a318 (diff)
parent7112cd4687687203b35013f197089cb66508a14e (diff)
downloadframeworks_base-55340e51343a248260f89e953476b1c6e731842a.zip
frameworks_base-55340e51343a248260f89e953476b1c6e731842a.tar.gz
frameworks_base-55340e51343a248260f89e953476b1c6e731842a.tar.bz2
am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
* commit '7112cd4687687203b35013f197089cb66508a14e': Doc Update: Removed "no guaranteed delivery" line.
Diffstat (limited to 'docs/html')
-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 a402e8e..1762e12 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>