Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev am: 68fca5a1...

author Prashant Malani <pmalani@google.com>

Tue, 8 Dec 2015 17:16:33 +0000 (17:16 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 8 Dec 2015 17:16:33 +0000 (17:16 +0000)
author Prashant Malani <pmalani@google.com>
Tue, 8 Dec 2015 17:16:33 +0000 (17:16 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 8 Dec 2015 17:16:33 +0000 (17:16 +0000)
diff --cc services/inputflinger/InputReader.cpp
Simple merge
diff --cc services/inputflinger/InputReader.h
Simple merge
author	Prashant Malani <pmalani@google.com>
	Tue, 8 Dec 2015 17:16:33 +0000 (17:16 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 8 Dec 2015 17:16:33 +0000 (17:16 +0000)
		1	2
services/inputflinger/InputReader.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/inputflinger/InputReader.h	patch \|	diff1 \|	diff2 \|	blob \| history