summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2017-10-17 21:57:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-17 21:57:49 +0000
commita3524a255f7e460309950b2869cadb42ec47ffd2 (patch)
tree2f6174d1ac7f921af1ba1108896a2b4ae4c07423
parent486dc4a497f280ca2aa9a7b610268a66f145ee0b (diff)
parent314ddcd9a30ddfbc6f872cbae7712154470f5c60 (diff)
downloadsystem_core-a3524a255f7e460309950b2869cadb42ec47ffd2.tar.gz
system_core-a3524a255f7e460309950b2869cadb42ec47ffd2.tar.bz2
system_core-a3524a255f7e460309950b2869cadb42ec47ffd2.zip
resolve merge conflicts of 796987482 to stage-aosp-master am: bb5ec4a926
am: 314ddcd9a3 Change-Id: I4fee960013f5539d85613eb09e365ee580ed1745
-rw-r--r--healthd/healthd_mode_charger.cpp1
-rw-r--r--libcutils/fs_config.cpp1
-rw-r--r--libcutils/properties.cpp1
-rw-r--r--libsparse/sparse_read.cpp1
-rw-r--r--logcat/getopt_long.cpp1
-rw-r--r--trusty/storage/tests/main.cpp1
6 files changed, 0 insertions, 6 deletions
diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
index 6c6d73880..4f77e7a1e 100644
--- a/healthd/healthd_mode_charger.cpp
+++ b/healthd/healthd_mode_charger.cpp
@@ -18,7 +18,6 @@
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
-#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 1d3e5ead8..7603ffce6 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -22,7 +22,6 @@
#include <errno.h>
#include <fcntl.h>
-#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/libcutils/properties.cpp b/libcutils/properties.cpp
index d2645e640..25ff1a3ad 100644
--- a/libcutils/properties.cpp
+++ b/libcutils/properties.cpp
@@ -21,7 +21,6 @@
#include <ctype.h>
#include <errno.h>
#include <inttypes.h>
-#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/libsparse/sparse_read.cpp b/libsparse/sparse_read.cpp
index 91d551c14..437963527 100644
--- a/libsparse/sparse_read.cpp
+++ b/libsparse/sparse_read.cpp
@@ -21,7 +21,6 @@
#include <inttypes.h>
#include <fcntl.h>
#include <stdarg.h>
-#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/logcat/getopt_long.cpp b/logcat/getopt_long.cpp
index 5f8dd66e3..da999069d 100644
--- a/logcat/getopt_long.cpp
+++ b/logcat/getopt_long.cpp
@@ -49,7 +49,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/trusty/storage/tests/main.cpp b/trusty/storage/tests/main.cpp
index 1fd6f8ddc..45291360d 100644
--- a/trusty/storage/tests/main.cpp
+++ b/trusty/storage/tests/main.cpp
@@ -16,7 +16,6 @@
#include <assert.h>
#include <stdint.h>
-#include <stdbool.h>
#include <gtest/gtest.h>
#include <trusty/lib/storage.h>