summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2017-01-11 13:40:26 -0600
committerMark Salyzyn2017-01-11 13:41:38 -0600
commit271a1a7cda437756e442d478eaa8aaf772be7a62 (patch)
tree971bc66232a8ebb3cf04238338fb43cab0ba9dc8 /libsuspend
parent5f41003d1f270bd56a451b8a1a0426fc2643bd1e (diff)
parenta45b1d6f38047760bf206889517cc43c012d1317 (diff)
downloadplatform-system-core-271a1a7cda437756e442d478eaa8aaf772be7a62.tar.gz
platform-system-core-271a1a7cda437756e442d478eaa8aaf772be7a62.tar.xz
platform-system-core-271a1a7cda437756e442d478eaa8aaf772be7a62.zip
resolve merge conflicts of a45b1d6f3 to master
Test: compile Bug: 30465923 Change-Id: I648855539df3cfa176c6ecac19b6a562ba6feaf7
Diffstat (limited to 'libsuspend')
-rw-r--r--libsuspend/autosuspend.c2
-rw-r--r--libsuspend/autosuspend_wakeup_count.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libsuspend/autosuspend.c b/libsuspend/autosuspend.c
index 2e1983acb..96e1c10d0 100644
--- a/libsuspend/autosuspend.c
+++ b/libsuspend/autosuspend.c
@@ -18,7 +18,7 @@
18 18
19#include <stdbool.h> 19#include <stdbool.h>
20 20
21#include <android/log.h> 21#include <log/log.h>
22 22
23#include <suspend/autosuspend.h> 23#include <suspend/autosuspend.h>
24 24
diff --git a/libsuspend/autosuspend_wakeup_count.c b/libsuspend/autosuspend_wakeup_count.c
index d3fb45fcf..4dedf7f9f 100644
--- a/libsuspend/autosuspend_wakeup_count.c
+++ b/libsuspend/autosuspend_wakeup_count.c
@@ -28,7 +28,7 @@
28#include <sys/types.h> 28#include <sys/types.h>
29#include <unistd.h> 29#include <unistd.h>
30 30
31#include <android/log.h> 31#include <log/log.h>
32 32
33#include "autosuspend_ops.h" 33#include "autosuspend_ops.h"
34 34