Merge commit 'bb94d790' into manualmerge

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

Change-Id: Ic1640c3620eb6b770bae7766af9ea5c64d74afe0
This commit is contained in:
Dirk Dougherty
2014-01-22 17:00:19 -08:00

View File

@@ -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 ?>