diff options
author | Nick Kralevich <nnk@google.com> | 2015-10-23 01:52:34 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-23 01:52:34 +0000 |
commit | 9ec978732f8dd82e7adef3e37097eaca3fbd65f0 (patch) | |
tree | f8659c6433a0d49cfd756c4a72a9bd967ab455f2 | |
parent | 90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd (diff) | |
parent | fa632f6ad7be6b1f488dd3d1b825a82456db5097 (diff) | |
download | native-9ec978732f8dd82e7adef3e37097eaca3fbd65f0.tar.gz |
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65
am: fa632f6ad7
* commit 'fa632f6ad7be6b1f488dd3d1b825a82456db5097':
DO NOT MERGE: fix build breakage
-rw-r--r-- | include/input/Input.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/input/Input.h b/include/input/Input.h index a8df11bde1..09419c9a61 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. |