diff options
| author | Katie McCormick <kmccormick@google.com> | 2011-02-10 12:38:07 -0800 |
|---|---|---|
| committer | Katie McCormick <kmccormick@google.com> | 2011-02-10 12:38:07 -0800 |
| commit | ce7c05e842d4e35ce180d398ecb969aad18f3460 (patch) | |
| tree | cd2fb1afbeab8f917c636763a12963ba2d858cdf /docs/html/guide/guide_toc.cs | |
| parent | 85bccf6e0b555bc5245628ba7340123b6b367b51 (diff) | |
| parent | 690d31a6a806fa3d00e568cbbfa0e60415594636 (diff) | |
resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index a375b115c397..ae31e862e279 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -276,7 +276,9 @@ <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> |