commit bf234fdfba1116cc29e8cc8443d08804843edf94
author Trevor Johns <trevorjohns@google.com> Tue Apr 12 10:35:42 2016 -0700
committer Trevor Johns <trevorjohns@google.com> Tue Apr 12 10:35:42 2016 -0700
tree eaba941c0a9937420e0351050b3f906afdae4d00
parent 6edfbfabad1ddbda00e0fcc713672f6e63acdf44

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

This reverts commit 6edfbfabad1ddbda00e0fcc713672f6e63acdf44, reversing
changes made to e09b2c16e32cee89d6b5ac29fe5a905b76872179.

tools/droiddoc/templates-sdk/components/masthead.cs

diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index e17612d..cc00baa 100644
--- 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>