diff options
| author | 2016-12-28 17:11:38 +0000 | |
|---|---|---|
| committer | 2016-12-28 17:11:38 +0000 | |
| commit | 525a5f2da844d1acc9e405fc4935d8a1cb2ece67 (patch) | |
| tree | 73123bf4e82507ca08ec638cba67c909a1535d1c /services/surfaceflinger/FrameTracker.cpp | |
| parent | 20bfa17b2a4bfb76f54aeb9301296d0f19ad1f3c (diff) | |
| parent | 430f62090cefe4630794873e30390433ad3e49a7 (diff) | |
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: 1efda0b1d6 am: 7e92307cd8
am: 430f62090c
Change-Id: I8bbed9204718da324f0bdeceb7b8156cb315e900
Diffstat (limited to 'services/surfaceflinger/FrameTracker.cpp')
| -rw-r--r-- | services/surfaceflinger/FrameTracker.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/surfaceflinger/FrameTracker.cpp b/services/surfaceflinger/FrameTracker.cpp index c09bbe4088..99c4f62153 100644 --- a/services/surfaceflinger/FrameTracker.cpp +++ b/services/surfaceflinger/FrameTracker.cpp @@ -19,13 +19,12 @@ #include <inttypes.h> -#include <cutils/log.h> +#include <android/log.h> +#include <utils/String8.h> #include <ui/Fence.h> #include <ui/FrameStats.h> -#include <utils/String8.h> - #include "FrameTracker.h" #include "EventLog/EventLog.h" |