summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Gilmore <egilmore@google.com> 2015-04-02 01:06:52 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-04-02 01:06:52 +0000
commit7278d89c1b51bc937e79021eae523dfd0f3d30a1 (patch)
tree7a93c9b62ef436511bd7bbfeb63a97d6cd5193e0
parent5f78af44bd9627dace7db4ce47fdf61cf8d78b42 (diff)
parentf2204720eac6fd959eb5a3732c0084636bc16095 (diff)
am f2204720: am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit 'f2204720eac6fd959eb5a3732c0084636bc16095': Changing wording to reflect c2dm shutdown.
-rw-r--r--docs/html/google/gcm/c2dm.jd5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/html/google/gcm/c2dm.jd b/docs/html/google/gcm/c2dm.jd
index 6ae7c1a0ee85..d0f8c7114af1 100644
--- a/docs/html/google/gcm/c2dm.jd
+++ b/docs/html/google/gcm/c2dm.jd
@@ -33,7 +33,10 @@ page.title=Migration
</div>
</div>
-<p>Android Cloud to Device Messaging (C2DM) is deprecated. The C2DM service will continue to be maintained in the short term, but C2DM will accept no new users, and it will grant no new quotas. <strong>C2DM developers are strongly encouraged to move to Google Cloud Messaging (GCM)</strong>. GCM is the next generation of C2DM.</p>
+<p>Android Cloud to Device Messaging (C2DM) was officially deprecated on June 26, 2012, and has been
+ shut down completely as of April 1, 2015. <strong>C2DM developers are strongly encouraged to move
+ to Google Cloud Messaging (GCM)</strong>. GCM is the next generation of C2DM.</p>
+
<p>This document is addressed to C2DM developers who are moving to GCM. It describes the differences between GCM and C2DM, and explains how to migrate existing C2DM apps to GCM.</p>