summaryrefslogtreecommitdiffstats
path: root/docs/html/tools/tools_toc.cs
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-02-04 10:56:46 -0800
committerRich Slogar <rslogar@google.com>2015-06-26 12:45:24 -0700
commit66502afb0faa49c6c310196f7e238b2566720713 (patch)
tree0ea56d84c24ac4dc6e6b541092e2fe8e7cd54e26 /docs/html/tools/tools_toc.cs
parent02e4f2fbe6e0511789d42d5942548158d2dd154f (diff)
downloadframeworks_base-66502afb0faa49c6c310196f7e238b2566720713.zip
frameworks_base-66502afb0faa49c6c310196f7e238b2566720713.tar.gz
frameworks_base-66502afb0faa49c6c310196f7e238b2566720713.tar.bz2
docs: manifest merger updates
Change-Id: I0a1c311ba08077b15ee1823146773b7d07162dd4
Diffstat (limited to 'docs/html/tools/tools_toc.cs')
-rw-r--r--docs/html/tools/tools_toc.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs
index 9ba7a22..7fbb0eb 100644
--- a/docs/html/tools/tools_toc.cs
+++ b/docs/html/tools/tools_toc.cs
@@ -188,6 +188,8 @@ class="en">Tools Help</span></a></div>
<span class="en">Configuring Gradle Builds</span></a></li>
<li><a href="<?cs var:toroot ?>tools/building/plugin-for-gradle.html">
<span class="en">Android Plugin for Gradle</span></a></li>
+ <li><a href="<?cs var:toroot ?>tools/building/manifest-merge.html">
+ <span class="en">Manifest Merging</span></a></li>
<li><a href="<?cs var:toroot ?>tools/building/multidex.html">
<span class="en">Apps Over 65K Methods</span></a></li>
</ul>