summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2017-01-11 13:20:50 -0600
committerandroid-build-merger2017-01-11 13:20:50 -0600
commit5482cb01b23f948e36e34002dab5ada8baeef406 (patch)
tree6cbabd2df058e26c84fa4649b9fc6038cef545db /libsuspend
parent2553a20da91db53a2080f0b9896674340dad59d7 (diff)
parentc3b346ea936aa592c9856ae461b2251bbe7dafb5 (diff)
downloadplatform-system-core-5482cb01b23f948e36e34002dab5ada8baeef406.tar.gz
platform-system-core-5482cb01b23f948e36e34002dab5ada8baeef406.tar.xz
platform-system-core-5482cb01b23f948e36e34002dab5ada8baeef406.zip
Merge "liblog: use log/log.h when utilizing ALOG macros" am: 01e12b4ee7
am: c3b346ea93 Change-Id: I0ee5652701e23d751def8bac82534af530ea5dc8
Diffstat (limited to 'libsuspend')
-rw-r--r--libsuspend/autosuspend.c2
-rw-r--r--libsuspend/autosuspend_autosleep.c2
-rw-r--r--libsuspend/autosuspend_earlysuspend.c2
-rw-r--r--libsuspend/autosuspend_wakeup_count.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/libsuspend/autosuspend.c b/libsuspend/autosuspend.c
index 64d1bfc74..54730c293 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_autosleep.c b/libsuspend/autosuspend_autosleep.c
index 97109ac2c..77d8db0a6 100644
--- a/libsuspend/autosuspend_autosleep.c
+++ b/libsuspend/autosuspend_autosleep.c
@@ -24,7 +24,7 @@
24#include <sys/types.h> 24#include <sys/types.h>
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include <android/log.h> 27#include <log/log.h>
28 28
29#include "autosuspend_ops.h" 29#include "autosuspend_ops.h"
30 30
diff --git a/libsuspend/autosuspend_earlysuspend.c b/libsuspend/autosuspend_earlysuspend.c
index 9519e51ea..809ee825e 100644
--- a/libsuspend/autosuspend_earlysuspend.c
+++ b/libsuspend/autosuspend_earlysuspend.c
@@ -26,7 +26,7 @@
26#include <sys/types.h> 26#include <sys/types.h>
27#include <unistd.h> 27#include <unistd.h>
28 28
29#include <android/log.h> 29#include <log/log.h>
30 30
31#include "autosuspend_ops.h" 31#include "autosuspend_ops.h"
32 32
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