summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-05-23 10:56:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-23 10:56:56 -0700
commit5482b65ae8d3d02fa4b07a2221b3f00079c9aa80 (patch)
tree86e1427062e7a9cfba84d520bebf615e364f96cf
parenta9a0409d626bc63c6cbd4b734ce8609559bb9540 (diff)
parent88f24e6fe8b854f43bebc77c891228a28a503cd9 (diff)
downloadframeworks_base-5482b65ae8d3d02fa4b07a2221b3f00079c9aa80.zip
frameworks_base-5482b65ae8d3d02fa4b07a2221b3f00079c9aa80.tar.gz
frameworks_base-5482b65ae8d3d02fa4b07a2221b3f00079c9aa80.tar.bz2
am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
* commit '88f24e6fe8b854f43bebc77c891228a28a503cd9': 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>