commit 0bb2c1702a0ca2b174b70ac2d5364548453ba524
author Dirk Dougherty <ddougherty@google.com> Wed Jan 22 17:00:19 2014 -0800
committer Dirk Dougherty <ddougherty@google.com> Wed Jan 22 17:00:19 2014 -0800
tree 557d828968373ff292fe91b299bf25e95e913a36
parent 6b55f00762c03b3625862b89f704090f58f970e7
parent bb94d790284161b9ccf2b0d4a42435ee232c34d5

Merge commit 'bb94d790' into manualmerge

Conflicts:
	tools/droiddoc/templates-sdk/sample.cs

Change-Id: Ic1640c3620eb6b770bae7766af9ea5c64d74afe0

tools/droiddoc/templates-sdk/sample.cs

diff --git a/tools/droiddoc/templates-sdk/sample.cs b/tools/droiddoc/templates-sdk/sample.cs
index 43cda54..c6f28f8 100644
--- a/tools/droiddoc/templates-sdk/sample.cs
+++ b/tools/droiddoc/templates-sdk/sample.cs
@@ -30,7 +30,7 @@
 <div id="pathCrumb">
 <?cs each:item = parentdirs ?>
   <?cs if:LinkifyPathCrumb
-    ?><a href="<?cs var:toroot ?><?cs var:item.Link ?>"><?cs var:item.Name ?></a> /
+    ?><a href="<?cs var:toroot ?><?cs var:item.Link ?>"><?cs var:item.Name ?></a> / 
   <?cs else
     ?><?cs var:item.Name ?> / <?cs /if ?>
 <?cs /each ?>