summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-10-23 04:15:24 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-23 04:15:24 +0000
commit0370a03b6e74e40d5110b83fed2243bf072aee73 (patch)
tree6a0178fff3a8aff0986c89cc2ab9a13de732cfb0
parenta82ace99f76ed815e16ab64eae2e9e55871a8b8f (diff)
parent1b28b05d2edf11f49717b53cd49a9161892f0388 (diff)
downloadframeworks_native-0370a03b6e74e40d5110b83fed2243bf072aee73.zip
frameworks_native-0370a03b6e74e40d5110b83fed2243bf072aee73.tar.gz
frameworks_native-0370a03b6e74e40d5110b83fed2243bf072aee73.tar.bz2
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f
am: 1b28b05d2e * commit '1b28b05d2edf11f49717b53cd49a9161892f0388': DO NOT MERGE: fix build breakage
-rw-r--r--include/input/Input.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/input/Input.h b/include/input/Input.h
index 92b3d36..617175b 100644
--- 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.