diff options
author | Scott Main <smain@google.com> | 2011-01-11 14:51:21 -0800 |
---|---|---|
committer | Scott Main <smain@google.com> | 2011-01-11 14:51:21 -0800 |
commit | 7024a313e44bd19374352e552efd089570605d83 (patch) | |
tree | d96585a99bd564c59648180bd92e20edab1052ee /docs/html/guide/guide_toc.cs | |
parent | 9008121c9719c70f581cd48ea206296cbb275153 (diff) | |
parent | ac8d79266b1629f7d0cda81408faf8d05f09c50a (diff) |
resolved conflicts for merge of ac8d7926 to honeycomb-plus-aosp
Change-Id: I873904e7724c3822d6011b507649c9d2d9e9bfef
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
-rw-r--r-- | docs/html/guide/guide_toc.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index a984acd18d39..ca934ec3a69e 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -488,12 +488,13 @@ </li> </ul> </li> - <li><a href="/guide/developing/tools/proguard.html">ProGuard</a></li> - <li><a href="/guide/developing/tools/adb.html#sqlite">sqlite3</a></li> - <li><a href="/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/tools/proguard.html">ProGuard</a> +<span class="new">new!</span></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> </ul> </li> |