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/InputReader.cpp | |
| parent | f38ec8abdf0a77b3e0e58dbc470a52d2f25a5eb4 (diff) | |
| parent | 525a5f2da844d1acc9e405fc4935d8a1cb2ece67 (diff) | |
resolve merge conflicts of 525a5f2 to master
Test: build
Change-Id: Id1c6d3d9dd158fb086b0d8ab74f7838ef0a51af1
Diffstat (limited to 'services/inputflinger/InputReader.cpp')
| -rw-r--r-- | services/inputflinger/InputReader.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp index 4dec34bc93..fbc7b12b92 100644 --- a/services/inputflinger/InputReader.cpp +++ b/services/inputflinger/InputReader.cpp @@ -44,17 +44,18 @@ #include "InputReader.h" -#include <cutils/log.h> -#include <input/Keyboard.h> -#include <input/VirtualKeyMap.h> - +#include <errno.h> #include <inttypes.h> +#include <limits.h> +#include <math.h> #include <stddef.h> #include <stdlib.h> #include <unistd.h> -#include <errno.h> -#include <limits.h> -#include <math.h> + +#include <android/log.h> + +#include <input/Keyboard.h> +#include <input/VirtualKeyMap.h> #define INDENT " " #define INDENT2 " " |