diff options
| author | 2016-12-28 09:28:53 -0800 | |
|---|---|---|
| committer | 2016-12-28 09:29:20 -0800 | |
| commit | c03d283e8b3f830d76dd94822b2a13872c05c730 (patch) | |
| tree | 514c1b1518ea1b3b863856857ad1cd79b88d00f1 /services/inputflinger/InputDispatcher.cpp | |
| parent | f38ec8abdf0a77b3e0e58dbc470a52d2f25a5eb4 (diff) | |
| parent | 525a5f2da844d1acc9e405fc4935d8a1cb2ece67 (diff) | |
resolve merge conflicts of 525a5f2 to master
Test: build
Change-Id: Id1c6d3d9dd158fb086b0d8ab74f7838ef0a51af1
Diffstat (limited to 'services/inputflinger/InputDispatcher.cpp')
| -rw-r--r-- | services/inputflinger/InputDispatcher.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp index 3f69d49f0b..793d59a0c0 100644 --- a/services/inputflinger/InputDispatcher.cpp +++ b/services/inputflinger/InputDispatcher.cpp @@ -45,16 +45,16 @@ #include "InputDispatcher.h" -#include <utils/Trace.h> -#include <cutils/log.h> -#include <powermanager/PowerManager.h> -#include <ui/Region.h> - -#include <stddef.h> -#include <unistd.h> #include <errno.h> #include <limits.h> +#include <stddef.h> #include <time.h> +#include <unistd.h> + +#include <android/log.h> +#include <utils/Trace.h> +#include <powermanager/PowerManager.h> +#include <ui/Region.h> #define INDENT " " #define INDENT2 " " |