diff options
| author | Rich Slogar <rslogar@google.com> | 2015-06-26 22:25:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-26 22:25:35 +0000 |
| commit | 3686e0430f8366e2f4de867eeabfd1b7fe4aefc0 (patch) | |
| tree | 5c7239c7d3fab26267aa88ddcbbb561b63670bdd /docs/html/tools/tools_toc.cs | |
| parent | 2a1be1bc387a97e86dac4d77d269d07eff71de41 (diff) | |
| parent | 268a7c190c37a7a63bd1134c4dfb8aacf71c211e (diff) | |
| download | frameworks_base-3686e0430f8366e2f4de867eeabfd1b7fe4aefc0.zip frameworks_base-3686e0430f8366e2f4de867eeabfd1b7fe4aefc0.tar.gz frameworks_base-3686e0430f8366e2f4de867eeabfd1b7fe4aefc0.tar.bz2 | |
am 268a7c19: am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs
* commit '268a7c190c37a7a63bd1134c4dfb8aacf71c211e':
docs: manifest merger updates
Diffstat (limited to 'docs/html/tools/tools_toc.cs')
| -rw-r--r-- | docs/html/tools/tools_toc.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs index 887ca2f..abfa030 100644 --- a/docs/html/tools/tools_toc.cs +++ b/docs/html/tools/tools_toc.cs @@ -189,6 +189,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> |