Merge "Ignore nested keyboard navigation clusters" into oc-dev

author Evan Rosky <erosky@google.com>

Tue, 18 Apr 2017 22:54:01 +0000 (22:54 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 18 Apr 2017 22:54:08 +0000 (22:54 +0000)
author Evan Rosky <erosky@google.com>
Tue, 18 Apr 2017 22:54:01 +0000 (22:54 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 18 Apr 2017 22:54:08 +0000 (22:54 +0000)
diff --cc core/java/android/view/FocusFinder.java
Simple merge
diff --cc core/java/android/view/View.java
Simple merge
diff --cc core/java/android/view/ViewGroup.java
Simple merge
author	Evan Rosky <erosky@google.com>
	Tue, 18 Apr 2017 22:54:01 +0000 (22:54 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 18 Apr 2017 22:54:08 +0000 (22:54 +0000)
		1	2
core/java/android/view/FocusFinder.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/view/View.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/view/ViewGroup.java	patch \|	diff1 \|	diff2 \|	blob \| history