resolved conflicts for merge of 79a55d35 to klp-ub-dev (ecff92d9) · Commits · e / os / android_build

tools/droiddoc/templates-sdk/sample.cs

+5 −3

Original line number	Diff line number	Diff line
		@@ -17,7 +17,9 @@
		<!-- related links -->
		<a href="<?cs var:toroot ?>samples/<?cs var:projectDir ?>/index.html">Overview</a>
		\| <a href="<?cs var:toroot ?>samples/<?cs var:projectDir ?>/project.html">Project</a>
		\| <a href="<?cs var:toroot ?>downloads/samples/<?cs var:projectDir ?>.zip">Download</a>
		\| <a href="<?cs var:toroot ?>downloads/samples/<?cs var:projectDir ?>.zip"
		onclick="_gaq.push(['_trackEvent', 'Samples', 'Download', <?cs var:projectDir ?>]);"
		>Download</a>

		</div><!-- end sum-details-links -->