resolve merge conflicts of 1b9b273 to stage-aosp-master (dba909bd) · Commits · e / os / android_system_core

sdcard/Android.mk

+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.

0 → 100644

+203 −0

File added.

Preview size limit exceeded, changes collapsed.

0 → 100644

+418 −0

File added.

Preview size limit exceeded, changes collapsed.