summaryrefslogtreecommitdiffstats
path: root/docs/html/google
diff options
context:
space:
mode:
authorEric Gilmore <egilmore@google.com>2015-04-08 00:05:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-08 00:05:28 +0000
commitaac938a8597efb8d71ce7dc124779f1d268510eb (patch)
tree91d53323d8c607a5e2c08c3cf5a13f1829570152 /docs/html/google
parenta0c887c67e5d925247fcb77d714ccc3383c0d0da (diff)
parent4480bdad957351eefc6a15b8a0b4b3757800ab93 (diff)
downloadframeworks_base-aac938a8597efb8d71ce7dc124779f1d268510eb.zip
frameworks_base-aac938a8597efb8d71ce7dc124779f1d268510eb.tar.gz
frameworks_base-aac938a8597efb8d71ce7dc124779f1d268510eb.tar.bz2
Merge "Fixing date." into lmp-docs
Diffstat (limited to 'docs/html/google')
-rw-r--r--docs/html/google/gcm/c2dm.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/google/gcm/c2dm.jd b/docs/html/google/gcm/c2dm.jd
index d0f8c71..bc58e66 100644
--- a/docs/html/google/gcm/c2dm.jd
+++ b/docs/html/google/gcm/c2dm.jd
@@ -33,8 +33,8 @@ page.title=Migration
</div>
</div>
-<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
+<p>Android Cloud to Device Messaging (C2DM) was officially deprecated on June 26, 2012, and will be
+ shut down completely as of July 30, 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>