Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb5ec4a9 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

resolve merge conflicts of 79698748 to stage-aosp-master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ica884c137c5f21e261600b2b011ab963036c0cdb
parents 9c767212 79698748

healthd/healthd_mode_charger.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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>

libcutils/fs_config.cpp

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#include <errno.h>

#include <fcntl.h>

#include <stdbool.h>

#include <stdint.h>

#include <stdio.h>

#include <stdlib.h>

libcutils/properties.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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>

libsparse/sparse_read.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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>

logcat/getopt_long.cpp

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
 * POSSIBILITY OF SUCH DAMAGE.

 */



#include <stdbool.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>