diff options
| author | Scott Main <smain@google.com> | 2010-11-10 14:46:44 -0800 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2010-11-10 14:46:44 -0800 |
| commit | 77f5c9542e159cb9f2f2908227212d4add8ce74c (patch) | |
| tree | 06d9be556d5dc79d074232c7ae346c7e874f25f8 /docs | |
| parent | 17fd21fc0638d8734867b6f189efbabb227f3ae1 (diff) | |
| parent | 5a72672977b2682ee93160124d8fae9d64c16fe8 (diff) | |
| download | frameworks_base-77f5c9542e159cb9f2f2908227212d4add8ce74c.zip frameworks_base-77f5c9542e159cb9f2f2908227212d4add8ce74c.tar.gz frameworks_base-77f5c9542e159cb9f2f2908227212d4add8ce74c.tar.bz2 | |
resolved conflicts for merge of 5a726729 to gingerbread
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/resources/resources_toc.cs | 12 |
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> |