resolve merge conflicts of 834ac204 to klp-modular-dev.

Bug: 23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3

include/input/Input.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include <utils/String8.h>
		#include <utils/Timers.h>
		#include <utils/Vector.h>
		#include <stdint.h>

		/*
		* Additional private constants not defined in ndk/ui/input.h.