summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author kmccormick@google.com <kmccormick@google.com> 2012-11-20 08:38:19 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-11-20 08:38:19 -0800
commita711d1ee76cf2e731d28a011c81d7f772cefa6c2 (patch)
tree30b75ee4aa332524eab5f93fd50590559cdb91e7
parent1586168302f79d10e85a5aeed7b486c4244cc98e (diff)
parent55340e51343a248260f89e953476b1c6e731842a (diff)
am 55340e51: am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
* commit '55340e51343a248260f89e953476b1c6e731842a': 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 a402e8e641fa..1762e12fb16d 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>