Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"

This reverts commit 6edfbfabad, reversing changes made to e09b2c16e3.
2016-04-12 10:35:42 -07:00
parent 6edfbfabad
commit bf234fdfba
260 changed files with 8674 additions and 36802 deletions
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -252,7 +252,8 @@
          <?cs if:android.hasSamples ?>
          <li class="dac-nav-item samples">
            <a class="dac-nav-link" href="<?cs var:toroot ?>samples/index.html">Samples</a>
-          </li><?cs /if ?>
+          </li>
+          <?cs /if ?>
          <li class="dac-nav-item preview">
            <a class="dac-nav-link" href="<?cs var:toroot ?>preview/index.html">Preview</a>
          </li>