diff options
| author | Robert Ly <robertly@google.com> | 2011-02-02 16:07:25 -0800 |
|---|---|---|
| committer | Robert Ly <robertly@google.com> | 2011-02-02 16:08:23 -0800 |
| commit | d3f802c02f8adc49d45683c9ca69be17cbf3a69c (patch) | |
| tree | fe56cbfdcf6438424c3f2ee206f8a7a345e779f7 /docs/html/guide/guide_toc.cs | |
| parent | 6f6ef48dc9a40d6afe2b66db4d1a411771e85a5b (diff) | |
| parent | c0b3ba83b2ccb270024810dc6a4434458b10de28 (diff) | |
resolved conflicts for merge of c0b3ba83 to master
Change-Id: I9358b1b6f200cb41740bc4243f9ab65b3e76bd99
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 32abcc001ffd..ee8f5d44335b 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -465,27 +465,34 @@ <li><a href="<?cs var:toroot ?>guide/developing/tools/layoutopt.html">layoutopt</a></li> <li><a href="<?cs var:toroot ?>guide/developing/tools/logcat.html">logcat</a></li> <li><a href="<?cs var:toroot ?>guide/developing/tools/mksdcard.html">mksdcard</a></li> - - <li><a href="/guide/developing/tools/monkey.html">Monkey</a></li> - <li class="toggle-list"> - <div><a href="/guide/developing/tools/monkeyrunner_concepts.html"> - <span class="en">monkeyrunner</span> - </a></div> - <ul> - <li><a href="/guide/developing/tools/MonkeyDevice.html"> - <span class="en">MonkeyDevice</span> - </a></li> - <li><a href="/guide/developing/tools/MonkeyImage.html"> - <span class="en">MonkeyImage</span> - </a></li> - <li><a href="/guide/developing/tools/MonkeyRunner.html"> - <span class="en">MonkeyRunner</span> - </a></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/monkey.html">Monkey</a></li> + <li class="toggle-list"> + <div> + <a href="<?cs var:toroot ?>guide/developing/tools/monkeyrunner_concepts.html"> + <span class="en">monkeyrunner</span> + </a> + </div> + <ul> + <li> + <a href="<?cs var:toroot ?>guide/developing/tools/MonkeyDevice.html"> + <span class="en">MonkeyDevice</span> + </a> + </li> + <li> + <a href="<?cs var:toroot ?>guide/developing/tools/MonkeyImage.html"> + <span class="en">MonkeyImage</span> + </a> + </li> + <li> + <a href="<?cs var:toroot ?>guide/developing/tools/MonkeyRunner.html"> + <span class="en">MonkeyRunner</span> + </a> + </li> + </ul> + </li> + <li><a href="<?cs var:toroot ?>guide/developing/tools/proguard.html">ProGuard</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> |