diff options
| author | Robert Ly <robertly@google.com> | 2011-01-08 13:01:27 -0800 |
|---|---|---|
| committer | Robert Ly <robertly@google.com> | 2011-01-08 13:01:27 -0800 |
| commit | 3e770a7f9223a3996bb2d0cea34089d87fc586e7 (patch) | |
| tree | 858e967810324a3cac269861bd1aba91ffe3d700 /docs/html/guide/guide_toc.cs | |
| parent | a0c0ca981dfa7b061fbf497734f0dbb09a512853 (diff) | |
| parent | ec5ca94cfae8b2b16aa5ecc6874f0f3b80dde7df (diff) | |
resolved conflicts for merge of ec5ca94c to master
Change-Id: Id24be07a6a4abf1beec5f9dc6da6b752201c4838
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 bc87c1de4da6..746597f85d10 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -462,6 +462,7 @@ <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"> |