summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2017-10-17 14:36:14 -0500
committerElliott Hughes2017-10-17 14:36:14 -0500
commitbb5ec4a9260ad6140452dff90564a289da12b567 (patch)
treeaa6791fa27d9c9e6956d046e9e9ff9960b54192c /libcutils/fs_config.cpp
parent9c767212ebd9c12ec0e3242b5e01e2bf041b08c3 (diff)
parent796987482f3a56c4bc7ab7500a5dbe033ff11ae1 (diff)
downloadplatform-system-core-bb5ec4a9260ad6140452dff90564a289da12b567.tar.gz
platform-system-core-bb5ec4a9260ad6140452dff90564a289da12b567.tar.xz
platform-system-core-bb5ec4a9260ad6140452dff90564a289da12b567.zip
resolve merge conflicts of 796987482 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution. Change-Id: Ica884c137c5f21e261600b2b011ab963036c0cdb
Diffstat (limited to 'libcutils/fs_config.cpp')
-rw-r--r--libcutils/fs_config.cpp1
1 files changed, 0 insertions, 1 deletions
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 @@
22 22
23#include <errno.h> 23#include <errno.h>
24#include <fcntl.h> 24#include <fcntl.h>
25#include <stdbool.h>
26#include <stdint.h> 25#include <stdint.h>
27#include <stdio.h> 26#include <stdio.h>
28#include <stdlib.h> 27#include <stdlib.h>