diff options
| author | Robert Ly <robertly@google.com> | 2011-02-11 13:49:09 -0800 |
|---|---|---|
| committer | Robert Ly <robertly@google.com> | 2011-02-11 13:49:09 -0800 |
| commit | 65bdc59ea0e5c1cbc97ea2b288b71d48de173a79 (patch) | |
| tree | 45cb1d284625bbfa015689e790dbca66462e8510 /docs/html/guide/guide_toc.cs | |
| parent | 6059bb3e24bf47c3bfd805c887775db817d537e7 (diff) | |
| parent | 810c1c0c353e0531438df369a85925a5d82d81ad (diff) | |
resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp
Conflicts:
docs/html/guide/guide_toc.cs
Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index be75edddb78f..3a7c2c4eae26 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -282,10 +282,13 @@ <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/nfc/index.html"> + <span class="en">Near Field Communication</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> |