summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorkmccormick@google.com <kmccormick@google.com>2012-11-19 16:54:48 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-19 16:54:48 -0800
commit7112cd4687687203b35013f197089cb66508a14e (patch)
treed7f11ee54b54fe58090d0e8c99cb3faf4ebb9058 /docs/html
parent596d0e3881782096f7a6ea9959e8dc5f07004623 (diff)
parent2f9947e9aa2b795dbc7db282a99a09410f1fadf2 (diff)
downloadframeworks_base-7112cd4687687203b35013f197089cb66508a14e.zip
frameworks_base-7112cd4687687203b35013f197089cb66508a14e.tar.gz
frameworks_base-7112cd4687687203b35013f197089cb66508a14e.tar.bz2
am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
* commit '2f9947e9aa2b795dbc7db282a99a09410f1fadf2': 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 5d3ea56..57d56b2 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>