Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 5a726729 to gingerbread

Browse Source 
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
This commit is contained in:
Scott Main
2010-11-10 14:46:44 -08:00
parent 17fd21fc06 5a72672977
commit 77f5c9542e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/html/resources/resources_toc.cs
View File

@@ -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>