resolve merge conflicts of eb2034c to master

Change-Id: If4aee1757fd297a18a0433ad4aa3cf80382d9fdc
This commit is contained in:
Kevin Hufnagle
2016-09-26 20:50:51 -07:00

View File

@@ -200,7 +200,7 @@ public void onAccessibilityEvent(AccessibilityEvent event) {
}
</pre>
<h2 id="query">Query the View Hierarchy's for More Context</h2>
<h2 id="query">Query the View Hierarchy for More Context</h2>
<p>This step is optional, but highly useful. The Android platform provides the ability for an
{@link android.accessibilityservice.AccessibilityService} to query the view
hierarchy, collecting information about the UI component that generated an event, and