diff options
| author | Scott Main <smain@google.com> | 2009-09-03 09:41:39 -0700 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2009-09-03 09:41:39 -0700 |
| commit | 88ffe75acd9a183170751e8db971ee58d6ff3007 (patch) | |
| tree | 01c8d6d549c3d0ebafc1445af502ac556669af6d /docs/html/guide/guide_toc.cs | |
| parent | 22808e7bccb97ea52b9bc4611251980f35bdf750 (diff) | |
| parent | 438fdfe833de868ec4fa5e64d99f9161788fda00 (diff) | |
resolved conflicts for merge of 438fdfe8 to master
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 4015d7f31b32..20e17803a71c 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -255,6 +255,7 @@ <li><a href="<?cs var:toroot ?>guide/developing/tools/monkey.html">Monkey</a></li> <li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html#sqlite">sqlite3</a></li> <li><a href="<?cs var:toroot ?>guide/developing/tools/traceview.html" >Traceview</a></li> + <li><a href="<?cs var:toroot ?>guide/developing/tools/zipalign.html" >zipalign</a></li> </ul> </li> <!--<li><a href="<?cs var:toroot ?>guide/developing/instrumentation/index.html">Instrumentation</a></li> |