diff options
| author | 2017-01-11 08:30:03 -0800 | |
|---|---|---|
| committer | 2017-01-11 08:30:17 -0800 | |
| commit | db15537e6e0d35c7ed3b1bef45e421760be70683 (patch) | |
| tree | a37853e5f3889f478cbcd204b46d1c8c640215f2 /libs/hwui/JankTracker.cpp | |
| parent | 505d8262ab8702fea19c926bdff4d66bbbaa766a (diff) | |
| parent | 082a1721b5165420e11319b98eefaa35d0feb844 (diff) | |
resolve merge conflicts of 082a1721b516 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e
Diffstat (limited to 'libs/hwui/JankTracker.cpp')
| -rw-r--r-- | libs/hwui/JankTracker.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libs/hwui/JankTracker.cpp b/libs/hwui/JankTracker.cpp index ed6b211eef1b..0a9bf5450091 100644 --- a/libs/hwui/JankTracker.cpp +++ b/libs/hwui/JankTracker.cpp @@ -15,19 +15,21 @@ */ #include "JankTracker.h" -#include "Properties.h" -#include "utils/TimeUtils.h" +#include <errno.h> +#include <inttypes.h> #include <algorithm> -#include <cutils/ashmem.h> -#include <cutils/log.h> +#include <cmath> #include <cstdio> -#include <errno.h> -#include <inttypes.h> #include <limits> -#include <cmath> #include <sys/mman.h> +#include <cutils/ashmem.h> +#include <log/log.h> + +#include "Properties.h" +#include "utils/TimeUtils.h" + namespace android { namespace uirenderer { |