diff options
| author | Robert Ly <robertly@google.com> | 2012-01-19 13:25:07 -0800 |
|---|---|---|
| committer | Robert Ly <robertly@google.com> | 2012-01-19 13:25:07 -0800 |
| commit | 4e552533ea049970b54c1cdba5afb7d13496c3c1 (patch) | |
| tree | 2cd6a249bd9e5f9535e72fd234071279d5c24417 /docs/html/guide/guide_toc.cs | |
| parent | 12310ee801553e63091ce3bda6f07a5be31a473c (diff) | |
| parent | b078d942911d5e1cf9533f7fe3e156c579ba396e (diff) | |
resolved conflicts for merge of b078d942 to ics-mr1
Change-Id: I831c06f2c198cc8825788a05770397457e8d511c
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index b8d95e2f107b..ee4c48ecd846 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -271,7 +271,8 @@ </li> <li class="toggle-list"> <div><a href="<?cs var:toroot ?>guide/topics/renderscript/index.html"> - <span class="en">RenderScript</span></a> + <span class="en">Renderscript</span></a> + <span class="new">updated</span> </div> <ul> <li><a href="<?cs var:toroot ?>guide/topics/renderscript/graphics.html"> @@ -365,7 +366,7 @@ </ul> </li> <li><a href="<?cs var:toroot?>guide/topics/wireless/wifip2p.html"> - <span class="en">WiFi Direct</span></a> <span class="new">new!</span> + <span class="en">Wi-Fi Direct</span></a> <span class="new">new!</span> </li> <li class="toggle-list"> <div><a href="<?cs var:toroot?>guide/topics/usb/index.html"> |