summaryrefslogtreecommitdiffstats
path: root/tools/droiddoc
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2015-06-17 22:12:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-17 22:12:06 +0000
commit275ed9c5ab26cd4b6527aea3a695bc9bda9d4b32 (patch)
treec41f3e57990f7de8109956dd32b818661684cb07 /tools/droiddoc
parent5aa6832e6b5dc4274066346f4dbab93c17145577 (diff)
parent552de126e9b05b1c34db1c66a62615fc2ea3cee1 (diff)
downloadbuild-275ed9c5ab26cd4b6527aea3a695bc9bda9d4b32.zip
build-275ed9c5ab26cd4b6527aea3a695bc9bda9d4b32.tar.gz
build-275ed9c5ab26cd4b6527aea3a695bc9bda9d4b32.tar.bz2
am 552de126: am 42c75239: Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs
* commit '552de126e9b05b1c34db1c66a62615fc2ea3cee1': Docs: Fixing disappearance of the left-navs in NDK minisite.
Diffstat (limited to 'tools/droiddoc')
-rw-r--r--tools/droiddoc/templates-sdk/customizations.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/droiddoc/templates-sdk/customizations.cs b/tools/droiddoc/templates-sdk/customizations.cs
index 92e506a..aaef8ed 100644
--- a/tools/droiddoc/templates-sdk/customizations.cs
+++ b/tools/droiddoc/templates-sdk/customizations.cs
@@ -463,10 +463,10 @@ def:ndk_nav() ?>
<div class="dac-toggle-content" id="devdoc-nav">
<div class="scroll-pane">
<?cs
-if:guide ?><?cs include:"../../../../frameworks/base/docs/html-ndk/ndk/guides/guides_toc.cs" ?><?cs
-elif:reference ?><?cs include:"../../../../frameworks/base/docs/html-ndk/ndk/reference/reference_toc.cs" ?><?cs
-elif:downloads ?><?cs include:"../../../../frameworks/base/docs/html-ndk/ndk/downloads/downloads_toc.cs" ?><?cs
-elif:samples ?><?cs include:"../../../../frameworks/base/docs/html-ndk/ndk/samples/samples_toc.cs" ?><?cs
+if:guide ?><?cs include:"../../../../frameworks/base/docs/html/ndk/guides/guides_toc.cs" ?><?cs
+elif:reference ?><?cs include:"../../../../frameworks/base/docs/html/ndk/reference/reference_toc.cs" ?><?cs
+elif:downloads ?><?cs include:"../../../../frameworks/base/docs/html/ndk/downloads/downloads_toc.cs" ?><?cs
+elif:samples ?><?cs include:"../../../../frameworks/base/docs/html/ndk/samples/samples_toc.cs" ?><?cs
/if ?>
</div>
</div>