Commit 9ec97873 authored Oct 23, 2015 by Nick Kralevich Committed by android-build-merger Oct 23, 2015

resolve merge conflicts of 834ac204 to klp-modular-dev. am: 7f1ea80d

am: fa632f6a

* commit 'fa632f6a':
  DO NOT MERGE: fix build breakage

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.