commit 4ff8891dd21b357948d7e3588f22bee2145784c2
author Trevor Johns <trevorjohns@google.com> Tue Apr 19 01:15:39 2016 -0700
committer Trevor Johns <trevorjohns@google.com> Tue Apr 19 01:15:39 2016 -0700
tree 67d363c3288eb85a310a677562218bf3f088fa8b
parent 4b941608e9869ca2b2ead63a21ddf24d99cacaa7

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

This reverts commit bf234fdfba1116cc29e8cc8443d08804843edf94.

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 cc00baa..e17612d 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -252,8 +252,7 @@
           <?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>