resolve merge conflicts of 834ac204ce
to klp-modular-dev.
am: 7f1ea80d65
* commit '7f1ea80d65996ab687ff56a884da915535cdc176':
DO NOT MERGE: fix build breakage
This commit is contained in:
commit
fa632f6ad7
@ -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