summaryrefslogtreecommitdiff
path: root/libs/hwui/JankTracker.cpp
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2017-01-11 15:24:10 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-01-11 15:24:11 +0000
commite7fcbcb9919e8f1c0fc5935b8a6aeb0b0dec9700 (patch)
tree5ead0dab24f15b6ae2c483d1eb2810477ae9c7f8 /libs/hwui/JankTracker.cpp
parent216303cdb60412525a716f4df22140b1a439a4a3 (diff)
parent52eb4e01a49fe2e94555c000de38bbcbbb13401b (diff)
Merge "Replace cutils/log.h and log/logger.h with log/log.h"
Diffstat (limited to 'libs/hwui/JankTracker.cpp')
-rw-r--r--libs/hwui/JankTracker.cpp16
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 {