summaryrefslogtreecommitdiffstats
path: root/include/input
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-10-23 01:44:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-23 01:44:26 +0000
commitfa632f6ad7be6b1f488dd3d1b825a82456db5097 (patch)
tree287cc26a71f2a901393076ff1928104cb313af9b /include/input
parent9964d83869565cf4dda432129cfe50f6ede19338 (diff)
parent7f1ea80d65996ab687ff56a884da915535cdc176 (diff)
downloadframeworks_native-fa632f6ad7be6b1f488dd3d1b825a82456db5097.zip
frameworks_native-fa632f6ad7be6b1f488dd3d1b825a82456db5097.tar.gz
frameworks_native-fa632f6ad7be6b1f488dd3d1b825a82456db5097.tar.bz2
resolve merge conflicts of 834ac204ce to klp-modular-dev.
am: 7f1ea80d65 * commit '7f1ea80d65996ab687ff56a884da915535cdc176': DO NOT MERGE: fix build breakage
Diffstat (limited to 'include/input')
-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 a8df11b..09419c9 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.