diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2015-05-18 14:17:51 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2015-05-18 14:17:51 -0700 |
| commit | 05f803377ebcf2f9c6160fa125948598f0558113 (patch) | |
| tree | 137fd61b6419fa191a1940d53135db2dad7a7f07 /docs/html/about/about_toc.cs | |
| parent | 855d5495ffbd9d0e2dfbd22def462247a1a4e61b (diff) | |
| parent | ab6d5376048b72f40d978751d884e74f7ee90d31 (diff) | |
| download | frameworks_base-05f803377ebcf2f9c6160fa125948598f0558113.zip frameworks_base-05f803377ebcf2f9c6160fa125948598f0558113.tar.gz frameworks_base-05f803377ebcf2f9c6160fa125948598f0558113.tar.bz2 | |
resolved conflicts for merge of ab6d5376 to mnc-dev
Change-Id: Ice8e511bffa6a0bc3aec9e44c059a7dfde91d65f
Diffstat (limited to 'docs/html/about/about_toc.cs')
| -rw-r--r-- | docs/html/about/about_toc.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/html/about/about_toc.cs b/docs/html/about/about_toc.cs index b1357f2..a4bc4a5 100644 --- a/docs/html/about/about_toc.cs +++ b/docs/html/about/about_toc.cs @@ -1,11 +1,5 @@ <ul id="nav"> -<li class="nav-section"> - <div class="nav-section-header"><a href="<?cs var:toroot?>about/index.html">Welcome</a></div> - <ul> - <li><a href="<?cs var:toroot?>about/start.html">Get Started</a></li> - </ul> - </li> <li class="nav-section"> <div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/lollipop.html" zh-tw-lang="Lollipop" @@ -46,14 +40,20 @@ </ul> </li> - <li class="nav-section"> + <!-- <li class="nav-section"> <div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/android-4.0-highlights.html"> <span class="en">Ice Cream Sandwich</span></a></div> <ul> <li><a href="<?cs var:toroot ?>about/versions/android-4.0.3.html">Android 4.0.3 APIs</a></li> <li><a href="<?cs var:toroot ?>about/versions/android-4.0.html">Android 4.0 APIs</a> </li> </ul> + </li> --> + + <li class="nav-section"> + <div class="nav-section-header empty"><a href="<?cs +var:toroot?>about/android.html">About Android</a></div> </li> + <li class="nav-section"> <div class="nav-section-header empty"><a href="<?cs var:toroot?>about/dashboards/index.html">Dashboards</a></div> |