Merge "Add "KeyFallback" handling ability to Views"

author Evan Rosky <erosky@google.com>

Thu, 16 Nov 2017 21:55:03 +0000 (21:55 +0000)

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

Thu, 16 Nov 2017 21:55:03 +0000 (21:55 +0000)
author Evan Rosky <erosky@google.com>
Thu, 16 Nov 2017 21:55:03 +0000 (21:55 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 16 Nov 2017 21:55:03 +0000 (21:55 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/view/View.java
Simple merge
diff --cc core/java/android/view/ViewRootImpl.java
Simple merge
author	Evan Rosky <erosky@google.com>
	Thu, 16 Nov 2017 21:55:03 +0000 (21:55 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 16 Nov 2017 21:55:03 +0000 (21:55 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/view/View.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/view/ViewRootImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history