summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-01-25 16:54:20 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-25 16:54:20 -0800
commit9985fecaa0bf32e94695f49bb495c9d0cd41e174 (patch)
tree865b43b303c90046978a5f16132382ac8c2db544 /docs/html
parentb22446901c477f40863132a9617368852d358f64 (diff)
parentd243bc710c92e56974f52449d24e2c6b8dd0ef9e (diff)
downloadframeworks_base-9985fecaa0bf32e94695f49bb495c9d0cd41e174.zip
frameworks_base-9985fecaa0bf32e94695f49bb495c9d0cd41e174.tar.gz
frameworks_base-9985fecaa0bf32e94695f49bb495c9d0cd41e174.tar.bz2
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 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e' into eclair-plus-aosp * commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e': docs: reference the history JS file with docRoot in order to
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/search.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/search.jd b/docs/html/search.jd
index d0e7478..609ade9 100644
--- a/docs/html/search.jd
+++ b/docs/html/search.jd
@@ -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;