summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorEric Gilmore <egilmore@google.com>2015-04-01 23:13:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-01 23:13:26 +0000
commitb2b93762b8165ee47f49765816fc7ba0428c371c (patch)
tree6b88b9881336541b49b19930eeb17cd574113222 /docs/html
parent4fc3d3ff404c777e07616b704c68176d9060c4e4 (diff)
parent05591bdc294d6831f11ee047004ac5d049e8ce21 (diff)
downloadframeworks_base-b2b93762b8165ee47f49765816fc7ba0428c371c.zip
frameworks_base-b2b93762b8165ee47f49765816fc7ba0428c371c.tar.gz
frameworks_base-b2b93762b8165ee47f49765816fc7ba0428c371c.tar.bz2
Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
Diffstat (limited to 'docs/html')
-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 6ae7c1a..d0f8c71 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>