summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2012-11-30 12:40:43 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-30 12:40:43 -0800
commit861c55ffcc854563f4adec0b094c1b6948c72036 (patch)
tree48c2e2af50be35b4a60b0625963c1048a7bf5c1f /docs/html
parent1c92ce10b5123bc374f8cba2c61c4c56f9d4f319 (diff)
parent2dd93e22b6504eda5fb35f8f9e58ddb3f4a22fea (diff)
downloadframeworks_base-861c55ffcc854563f4adec0b094c1b6948c72036.zip
frameworks_base-861c55ffcc854563f4adec0b094c1b6948c72036.tar.gz
frameworks_base-861c55ffcc854563f4adec0b094c1b6948c72036.tar.bz2
am 2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev
* commit '2dd93e22b6504eda5fb35f8f9e58ddb3f4a22fea': docs: add correct toc for google reference
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/google/google_toc.cs26
1 files changed, 14 insertions, 12 deletions
diff --git a/docs/html/google/google_toc.cs b/docs/html/google/google_toc.cs
index fac3511..cc46d3b 100644
--- a/docs/html/google/google_toc.cs
+++ b/docs/html/google/google_toc.cs
@@ -34,20 +34,14 @@
<span class="en">Google Maps</span></a>
</li>
- <li id="tree-list" class="nav-section">
+ <li id="gms-tree-list" class="nav-section">
<div class="nav-section-header">
- <a href="<?cs var:toroot?>google/play-services/reference/packages.html">
- <span class="en">Reference</span></a>
- </div>
- <ul>
- <li><a href="<?cs var:toroot ?>google/play-services/reference/com/google/android/gms/auth/package-summary.html">auth</a></li>
- <li><a href="<?cs var:toroot ?>google/play-services/reference/com/google/android/gms/common/package-summary.html">common</a></li>
- <li><a href="<?cs var:toroot ?>google/play-services/reference/com/google/android/gms/maps/package-summary.html">maps</a></li>
- <li><a href="<?cs var:toroot ?>google/play-services/reference/com/google/android/gms/maps.model/package-summary.html">maps.model</a></li>
- <li><a href="<?cs var:toroot ?>google/play-services/reference/com/google/android/gms/panorama/package-summary.html">panorama</a></li>
- <li><a href="<?cs var:toroot ?>google/play-services/reference/com/google/android/gms/plus/package-summary.html">plus</a></li>
- </ul>
+ <a href="<?cs var:toroot ?>reference/gms-packages.html">
+ <span class="en">Reference</span>
+ </a>
+ <div>
</li>
+
</ul>
</li>
@@ -139,6 +133,14 @@
<li><a href="<?cs var:toroot?>google/gcm/c2dm.html">
<span class="en">Migration</span></a>
</li>
+ <li id="gcm-tree-list" class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>reference/gcm-packages.html">
+ <span class="en">Reference</span>
+ </a>
+ <div>
+ </li>
+
</ul>
</li>
</ul>