diff options
author | Katie McCormick <kmccormick@google.com> | 2011-02-10 13:03:27 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-10 13:03:27 -0800 |
commit | 360e40ef21791aa171a7b38547c1101daf349b6a (patch) | |
tree | 094752b9daa867c5d60e9fe236d9d1624b00bbaa /docs/html/guide/guide_toc.cs | |
parent | aa0d2124d58150f13ca1a2c70f2cbcc3efe7aa53 (diff) | |
parent | ce7c05e842d4e35ce180d398ecb969aad18f3460 (diff) |
am ce7c05e8: resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
* commit 'ce7c05e842d4e35ce180d398ecb969aad18f3460':
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
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 10e5004f4937..e57d39902686 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> |