diff options
| author | 2017-01-11 17:12:59 +0000 | |
|---|---|---|
| committer | 2017-01-11 17:13:02 +0000 | |
| commit | 7a98aee66a277a8e336180f42b439835cc23512b (patch) | |
| tree | dd22404df2673140a01610478af39267d27b4ba8 /libs/input/PointerController.cpp | |
| parent | 74bf35017635f896c449f78d37144124d445b918 (diff) | |
| parent | db15537e6e0d35c7ed3b1bef45e421760be70683 (diff) | |
Merge "resolve merge conflicts of 082a1721b516 to master"
Diffstat (limited to 'libs/input/PointerController.cpp')
| -rw-r--r-- | libs/input/PointerController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp index 0b22ad5ba470..7c6046789cdc 100644 --- a/libs/input/PointerController.cpp +++ b/libs/input/PointerController.cpp @@ -15,7 +15,6 @@ */ #define LOG_TAG "PointerController" - //#define LOG_NDEBUG 0 // Log debug messages about pointer updates @@ -23,8 +22,9 @@ #include "PointerController.h" -#include <cutils/log.h> +#include <log/log.h> +// ToDo: Fix code to be warning free #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #include <SkBitmap.h> |