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/distribute/essentials/essentials_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/distribute/essentials/essentials_toc.cs')
| -rw-r--r-- | docs/html/distribute/essentials/essentials_toc.cs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/docs/html/distribute/essentials/essentials_toc.cs b/docs/html/distribute/essentials/essentials_toc.cs index fe3fc87..baca18f 100644 --- a/docs/html/distribute/essentials/essentials_toc.cs +++ b/docs/html/distribute/essentials/essentials_toc.cs @@ -34,18 +34,7 @@ </a> </div> </li> - <li class="nav-section"> - <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/essentials/best-practices/apps.html"> - <span class="en">App Best Practices</span> - </a> - </div> - </li> - <li class="nav-section"> - <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/essentials/best-practices/games.html"> - <span class="en">Game Best Practices</span> - </a> - </div> - </li> +</ul> <script type="text/javascript"> |