diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-10-13 19:32:02 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2010-10-13 19:32:02 -0700 |
| commit | 068e695676bff3f3a125f965a908597d64f7c773 (patch) | |
| tree | 6b3c05c78530093e29f6dbb3b5f2f9078e44382a /docs | |
| parent | b57832140ef7542a9e6f4f69f48efbfe80200c43 (diff) | |
| parent | d555e2643f2bdc8b7e6096ce40943fcc56ec22d2 (diff) | |
| download | frameworks_base-068e695676bff3f3a125f965a908597d64f7c773.zip frameworks_base-068e695676bff3f3a125f965a908597d64f7c773.tar.gz frameworks_base-068e695676bff3f3a125f965a908597d64f7c773.tar.bz2 | |
Doc change: Merge commit 'd555e264' into manualmerge
Conflicts:
docs/html/guide/guide_toc.cs
Change-Id: I473bc026fe24caf6a851e8f282b1874c75ef5a30
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 76d5f4f..2b80342 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -279,12 +279,8 @@ </ul> </li> <li><a href="<?cs var:toroot?>guide/topics/admin/device-admin.html"> - <span class="en">Device Administration</span></a> - <span class="new">new!</span> - </li> - <li><a href="<?cs var:toroot?>guide/topics/admin/device-admin.html"> - <span class="en">Device Administration</span> - </a> <span class="new">new!</span><!-- 10/8/10 --> + <span class="en">Device Administration</span> + </a> <span class="new">new!</span> </li> </ul> </li> |