diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-01-11 15:45:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-11 15:45:46 +0000 |
| commit | 082a1721b5165420e11319b98eefaa35d0feb844 (patch) | |
| tree | bc3c1b7e76fb41a950cd988903496e761b5c1d66 /libs/input/PointerController.cpp | |
| parent | 46c39f6c3640dabc3e5eb5d37460f0b3d0622da6 (diff) | |
| parent | ef8ccc8510d2c66c4807f15962c3d53235af5fc5 (diff) | |
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143cbf1e5
am: ef8ccc8510
Change-Id: If6673f44c7d08960f3a0a86703cebf577bd21f1b
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 abef66f9ecd9..07bcbd35819d 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> |