resolve merge conflicts of 834ac204ce
to klp-modular-dev. am: 7f1ea80d65
am: fa632f6ad7
am: 9ec978732f
am: 1b28b05d2e
am: 0370a03b6e
* commit '0370a03b6e74e40d5110b83fed2243bf072aee73':
DO NOT MERGE: fix build breakage
This commit is contained in:
commit
18e7c64ea8
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user