resolve merge conflicts of 834ac204ce
to klp-modular-dev.
Bug: 23905002 Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
This commit is contained in:
commit
7f1ea80d65
@ -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