summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-05-23 10:54:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-23 10:54:10 -0700
commit88f24e6fe8b854f43bebc77c891228a28a503cd9 (patch)
tree13b8b3901b7c4c09d66820ba7001e1ad6bc314f1
parentcfc593d5736b627e0fffe92e511ee326b9f6d326 (diff)
parent84fb096ee7a4f6d2af7dab6e18063ed029e0ff94 (diff)
downloadframeworks_base-88f24e6fe8b854f43bebc77c891228a28a503cd9.zip
frameworks_base-88f24e6fe8b854f43bebc77c891228a28a503cd9.tar.gz
frameworks_base-88f24e6fe8b854f43bebc77c891228a28a503cd9.tar.bz2
am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
* commit '84fb096ee7a4f6d2af7dab6e18063ed029e0ff94': Doc update: fix GCM TOC
-rw-r--r--docs/html/google/google_toc.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/docs/html/google/google_toc.cs b/docs/html/google/google_toc.cs
index 00246e2..13d3eb3 100644
--- a/docs/html/google/google_toc.cs
+++ b/docs/html/google/google_toc.cs
@@ -126,9 +126,18 @@
<li><a href="<?cs var:toroot?>google/gcm/gcm.html">
<span class="en">Architectural Overview</span></a>
</li>
+ <li><a href="<?cs var:toroot?>google/gcm/ccs.html">
+ <span class="en">Cloud Connection Server</span></a>
+ </li>
+ <li><a href="<?cs var:toroot?>google/gcm/notifications.html">
+ <span class="en">User Notifications</span></a>
+ </li>
<li><a href="<?cs var:toroot?>google/gcm/demo.html">
<span class="en">Demo App Tutorial</span></a>
</li>
+ <li><a href="<?cs var:toroot?>google/gcm/helper.html">
+ <span class="en">Using the Helper Libraries</span></a>
+ </li>
<li><a href="<?cs var:toroot?>google/gcm/adv.html">
<span class="en">Advanced Topics</span></a>
</li>