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

Commit 7a52c833 authored by Jorge Lucangeli Obes's avatar Jorge Lucangeli Obes Committed by android-build-merger
Browse files

resolve merge conflicts of 1b9b2735 to stage-aosp-master

am: dba909bd

Change-Id: I61506e871cfccaa1cc0bee70a0b8dd35029a3efe
parents faacb01c dba909bd
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := sdcard.c
LOCAL_SRC_FILES := sdcard.cpp fuse.c
LOCAL_MODULE := sdcard
LOCAL_CFLAGS := -Wall -Wno-unused-parameter -Werror
LOCAL_SHARED_LIBRARIES := liblog libcutils libpackagelistparser
+3 −690

File changed and moved.

Preview size limit exceeded, changes collapsed.

sdcard/fuse.h

0 → 100644
+203 −0

File added.

Preview size limit exceeded, changes collapsed.

sdcard/sdcard.cpp

0 → 100644
+418 −0

File added.

Preview size limit exceeded, changes collapsed.