diff options
| author | Nick Kralevich <nnk@google.com> | 2015-10-23 04:26:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-23 04:26:07 +0000 |
| commit | 69b8174c5e184d0a314821d24893e931946ede83 (patch) | |
| tree | c946b379b3930b220eb0dd551dcc5fb1c7ab58dd | |
| parent | cd9aad3a95c1fbb3062abada8cb851a41e79556d (diff) | |
| parent | 6eac97d4baf77954c7d862e7bf35ed3763543491 (diff) | |
| download | frameworks_native-69b8174c5e184d0a314821d24893e931946ede83.zip frameworks_native-69b8174c5e184d0a314821d24893e931946ede83.tar.gz frameworks_native-69b8174c5e184d0a314821d24893e931946ede83.tar.bz2 | |
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e am: 18e7c64ea8
am: 6eac97d4ba
* commit '6eac97d4baf77954c7d862e7bf35ed3763543491':
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 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. |