Commit e7d9ba24 authored Jan 28, 2010 by Scott Main Committed by Android Git Automerger Jan 28, 2010

am 9985feca: am d243bc71: Merge "docs: reference the history JS file with...

am 9985feca: am d243bc71: Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair

Merge commit '9985feca'

* commit '9985feca':
  docs: reference the history JS file with docRoot in order to

parents 6e59483f 9985feca

docs/html/search.jd

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ page.title=Search Results
		@jd:body

		<script src="http://www.google.com/jsapi" type="text/javascript"></script>
		<script src="/assets/jquery-history.js" type="text/javascript"></script>
		<script src="{@docRoot}assets/jquery-history.js" type="text/javascript"></script>
		<script type="text/javascript">
		var tabIndex = 0;