resolved conflicts for merge of 88aba541 to lmp-mr1-dev-plus-aosp

Change-Id: Ie5ef819dd8168cb6a73f84a881a92c116705fffc

diff --cc Android.mk
index fc644b5,f7e8170..532a843
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -76,15 -79,8 +79,15 @@@ LOCAL_SRC_FILES := 
        $(common_src_files)
  
  LOCAL_C_INCLUDES := $(common_c_includes)
- 
- LOCAL_CFLAGS := -Werror -Wall -Wno-missing-field-initializers
+ LOCAL_CFLAGS := $(vold_cflags)
+ LOCAL_CONLYFLAGS := $(vold_conlyflags)
 +
 +ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
 +LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH)
 +common_shared_libraries += libcryptfs_hw
 +LOCAL_CFLAGS += -DCONFIG_HW_DISK_ENCRYPTION
 +endif
 +
  LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
  LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
  

diff --cc cryptfs.c
Simple merge