ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65

Browse Source 
am: fa632f6ad7

* commit 'fa632f6ad7be6b1f488dd3d1b825a82456db5097':
  DO NOT MERGE: fix build breakage
This commit is contained in:
Nick Kralevich 2015-10-23 01:52:34 +00:00 committed by android-build-merger
commit 9ec978732f
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/input/Input.h
View File

@ -28,6 +28,7 @@
#include <utils/String8.h> #include <utils/String8.h>
#include <utils/Timers.h> #include <utils/Timers.h>
#include <utils/Vector.h> #include <utils/Vector.h>
#include <stdint.h>
/* /*
* Additional private constants not defined in ndk/ui/input.h. * Additional private constants not defined in ndk/ui/input.h.