summaryrefslogtreecommitdiffstats
path: root/docs/html/resources/resources_toc.cs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-11-10 14:55:48 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-10 14:55:48 -0800
commitd4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2 (patch)
tree967cbf8c3a1bdeb005a4f3b16225c49504682d4c /docs/html/resources/resources_toc.cs
parentd6c7893d663aa74840bb491ddbce500bc0752ac5 (diff)
parent77f5c9542e159cb9f2f2908227212d4add8ce74c (diff)
downloadframeworks_base-d4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2.zip
frameworks_base-d4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2.tar.gz
frameworks_base-d4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2.tar.bz2
am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c': docs: remove "new" tags from sample apps
Diffstat (limited to 'docs/html/resources/resources_toc.cs')
-rw-r--r--docs/html/resources/resources_toc.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs
index 735a00e..117ecfb 100644
--- a/docs/html/resources/resources_toc.cs
+++ b/docs/html/resources/resources_toc.cs
@@ -202,7 +202,7 @@
</a></li>
<li><a href="<?cs var:toroot ?>resources/samples/BackupRestore/index.html">
<span class="en">Backup and Restore</span>
- </a> <span class="new">new!</span></li>
+ </a></li>
<li><a href="<?cs var:toroot ?>resources/samples/BluetoothChat/index.html">
<span class="en">Bluetooth Chat</span>
</a></li>
@@ -235,7 +235,7 @@
</a></li>
<li><a href="<?cs var:toroot ?>resources/samples/SearchableDictionary/index.html">
<span class="en">Searchable Dictionary v2</span>
- </a> <span class="new">new!</span></li>
+ </a></li>
<li><a href="<?cs var:toroot ?>resources/samples/SipDemo/index.html">
<span class="en">SIP Demo</span>
</a> <span class="new">new!</span></li>
@@ -247,16 +247,16 @@
</a></li>
<li><a href="<?cs var:toroot ?>resources/samples/Spinner/index.html">
<span class="en">Spinner</span>
- </a> <span class="new">new!</span></li>
+ </a></li>
<li><a href="<?cs var:toroot ?>resources/samples/SpinnerTest/index.html">
<span class="en">SpinnerTest</span>
- </a> <span class="new">new!</span></li>
+ </a></li>
<li><a href="<?cs var:toroot ?>resources/samples/TicTacToeLib/index.html">
<span class="en">TicTacToeLib</span>
- </a> <span class="new">new!</span></li>
+ </a></li>
<li><a href="<?cs var:toroot ?>resources/samples/TicTacToeMain/index.html">
<span class="en">TicTacToeMain</span>
- </a> <span class="new">new!</span></li>
+ </a></li>
<li><a href="<?cs var:toroot ?>resources/samples/Wiktionary/index.html">
<span class="en">Wiktionary</span>
</a></li>