diff options
| author | Scott Main <smain@google.com> | 2011-01-11 14:53:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-11 14:53:52 -0800 |
| commit | e15c4e4d63841af70538ae9f1988b53d1bbd15e4 (patch) | |
| tree | 1bb8c54f12e8faaac7a13d5b82697be6b8f625c8 | |
| parent | a94aeb3175aca5695030b190a3bca0eae5ef3c4d (diff) | |
| parent | 7024a313e44bd19374352e552efd089570605d83 (diff) | |
| download | frameworks_base-e15c4e4d63841af70538ae9f1988b53d1bbd15e4.zip frameworks_base-e15c4e4d63841af70538ae9f1988b53d1bbd15e4.tar.gz frameworks_base-e15c4e4d63841af70538ae9f1988b53d1bbd15e4.tar.bz2 | |
Merge "resolved conflicts for merge of ac8d7926 to honeycomb-plus-aosp" into honeycomb-plus-aosp
| -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 a984acd..ca934ec 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> |