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

Bug: 23905002 Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
2015-10-22 17:26:19 -07:00 · 2015-10-22 17:26:19 -07:00 · 7f1ea80d65
parent 72c8ca4a01 834ac204ce
commit 7f1ea80d65
1 changed files with 1 additions and 0 deletions
--- a/include/input/Input.h
+++ b/include/input/Input.h
@ -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.