resolved conflicts for merge of 1e94a78a (ApiDemos accessibility stuff) to master
Change-Id: I0b9d24c7aa527bd74c99cb6270fba5e3b9eae421
diff --git a/samples/ApiDemos/_index.html b/samples/ApiDemos/_index.html
index ee230a9..214c20f 100644
--- a/samples/ApiDemos/_index.html
+++ b/samples/ApiDemos/_index.html
@@ -1,19 +1,19 @@
-<p>The API Demos application includes a variety of small applications
+<p>The API Demos application includes a variety of small applications
that illustrate the use of various Android APIs. It includes samples of:
</p>
<ul>
- <li>Notifications</li>
- <li>Alarms</li>
- <li>Progress Dialogs</li>
- <li>Intents</li>
- <li>Menus</li>
- <li>Search</li>
- <li>Persistent application state</li>
- <li>Preferences</li>
- <li>Background Services</li>
- <li>App Widgets</li>
- <li>Voice Recognition</li>
- <li>And many many more...</li>
+ <li>Notifications</li>
+ <li>Alarms</li>
+ <li>Progress Dialogs</li>
+ <li>Intents</li>
+ <li>Menus</li>
+ <li>Search</li>
+ <li>Persistent application state</li>
+ <li>Preferences</li>
+ <li>Background Services</li>
+ <li>App Widgets</li>
+ <li>Voice Recognition</li>
+ <li>And many many more...</li>
</ul>
<div class="note">
@@ -37,6 +37,9 @@
support</a></li>
<li><a href="src/com/example/android/apis/view/Switches.html">Switch widget</a></li>
<li><a href="src/com/example/android/apis/accessibility/AccessibilityNodeProviderActivity.html">Accessibility Node Provider</a></li>
+<li><a
+ href="src/com/example/android/apis/accessibility/TaskBackService.html">Window
+ Querying Accessibility Service</a></li>
</ul>
</div>