am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread

* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c':
  docs: remove "new" tags from sample apps
This commit is contained in:
Scott Main
2010-11-10 14:55:48 -08:00
committed by Android Git Automerger

View File

@@ -202,7 +202,7 @@
</a></li> </a></li>
<li><a href="<?cs var:toroot ?>resources/samples/BackupRestore/index.html"> <li><a href="<?cs var:toroot ?>resources/samples/BackupRestore/index.html">
<span class="en">Backup and Restore</span> <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"> <li><a href="<?cs var:toroot ?>resources/samples/BluetoothChat/index.html">
<span class="en">Bluetooth Chat</span> <span class="en">Bluetooth Chat</span>
</a></li> </a></li>
@@ -235,7 +235,7 @@
</a></li> </a></li>
<li><a href="<?cs var:toroot ?>resources/samples/SearchableDictionary/index.html"> <li><a href="<?cs var:toroot ?>resources/samples/SearchableDictionary/index.html">
<span class="en">Searchable Dictionary v2</span> <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"> <li><a href="<?cs var:toroot ?>resources/samples/SipDemo/index.html">
<span class="en">SIP Demo</span> <span class="en">SIP Demo</span>
</a> <span class="new">new!</span></li> </a> <span class="new">new!</span></li>
@@ -247,16 +247,16 @@
</a></li> </a></li>
<li><a href="<?cs var:toroot ?>resources/samples/Spinner/index.html"> <li><a href="<?cs var:toroot ?>resources/samples/Spinner/index.html">
<span class="en">Spinner</span> <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"> <li><a href="<?cs var:toroot ?>resources/samples/SpinnerTest/index.html">
<span class="en">SpinnerTest</span> <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"> <li><a href="<?cs var:toroot ?>resources/samples/TicTacToeLib/index.html">
<span class="en">TicTacToeLib</span> <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"> <li><a href="<?cs var:toroot ?>resources/samples/TicTacToeMain/index.html">
<span class="en">TicTacToeMain</span> <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"> <li><a href="<?cs var:toroot ?>resources/samples/Wiktionary/index.html">
<span class="en">Wiktionary</span> <span class="en">Wiktionary</span>
</a></li> </a></li>