diff options
| author | Scott Main <smain@google.com> | 2011-02-10 13:51:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-10 13:51:30 -0800 |
| commit | 4eccd96f4a7dc4b55070b79fe2fb852cbc7555dc (patch) | |
| tree | 6cbaccf4c21d249ce688e71a8c049761f004824d /docs/html/guide/guide_toc.cs | |
| parent | ed6d936eca072b729b1a52204dca1dcecdfc8f66 (diff) | |
| parent | c06e7abe6f37d1d8bc4f1c228964229d9f101d70 (diff) | |
am c06e7abe: resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
* commit 'c06e7abe6f37d1d8bc4f1c228964229d9f101d70':
docs: move the SIP guide into guide/network/
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index e57d39902686..27a4b89e24f3 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -276,12 +276,10 @@ <li><a href="<?cs var:toroot?>guide/topics/wireless/bluetooth.html"> <span class="en">Bluetooth</span> </a></li> - - <li><a href="<?cs var:toroot?>guide/topics/network/sip.html"> - - <span class="en">Session Initiation Protocol</span></a> - <span class="new">new!</span> - </li> + <li><a href="<?cs var:toroot?>guide/topics/network/sip.html"> + <span class="en">Session Initiation Protocol</span></a> + <span class="new">new!</span> + </li> <li class="toggle-list"> <div><a href="<?cs var:toroot?>guide/topics/search/index.html"> <span class="en">Search</span> |