diff options
| author | 2016-12-28 09:28:53 -0800 | |
|---|---|---|
| committer | 2016-12-28 09:29:20 -0800 | |
| commit | c03d283e8b3f830d76dd94822b2a13872c05c730 (patch) | |
| tree | 514c1b1518ea1b3b863856857ad1cd79b88d00f1 /services/surfaceflinger/FrameTracker.cpp | |
| parent | f38ec8abdf0a77b3e0e58dbc470a52d2f25a5eb4 (diff) | |
| parent | 525a5f2da844d1acc9e405fc4935d8a1cb2ece67 (diff) | |
resolve merge conflicts of 525a5f2 to master
Test: build
Change-Id: Id1c6d3d9dd158fb086b0d8ab74f7838ef0a51af1
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 319c2a7116..99c4daaba5 100644 --- a/services/surfaceflinger/FrameTracker.cpp +++ b/services/surfaceflinger/FrameTracker.cpp @@ -19,12 +19,11 @@ #include <inttypes.h> -#include <cutils/log.h> +#include <android/log.h> +#include <utils/String8.h> #include <ui/FrameStats.h> -#include <utils/String8.h> - #include "FrameTracker.h" #include "EventLog/EventLog.h" |