resolved conflicts for merge of 4037c458 to master

Change-Id: I8a2e73b7ba48b790054e0ab99f81b2693244389e

diff --cc services/surfaceflinger/Android.mk
index 44a06c6,3123b63..61edbff
--- 1/services/surfaceflinger/Android.mk
--- 2/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@@ -90,46 -90,46 +90,48 @@@ els
  endif
  
  LOCAL_CFLAGS += -fvisibility=hidden -Werror=format
 -LOCAL_CFLAGS += -std=c++11
 +LOCAL_CPPFLAGS := -std=c++11
  
  LOCAL_SHARED_LIBRARIES := \
-       libcutils \
-       liblog \
-       libdl \
-       libhardware \
-       libutils \
-       libEGL \
-       libGLESv1_CM \
-       libGLESv2 \
-       libbinder \
-       libui \
-       libgui \
-       libpowermanager
+     libcutils \
+     liblog \
+     libdl \
+     libhardware \
+     libutils \
+     libEGL \
+     libGLESv1_CM \
+     libGLESv2 \
+     libbinder \
+     libui \
+     libgui \
+     libpowermanager
  
 -LOCAL_MODULE:= libsurfaceflinger
 +LOCAL_MODULE := libsurfaceflinger
  
+ LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
+ 
  include $(BUILD_SHARED_LIBRARY)
  
  ###############################################################
  # build surfaceflinger's executable
  include $(CLEAR_VARS)
  
 +LOCAL_CLANG := true
 +
  LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic
 -LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\"
 -LOCAL_CPPFLAGS:= -std=c++11
 +LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"
 +LOCAL_CPPFLAGS := -std=c++11
  
 -LOCAL_SRC_FILES:= \
 +LOCAL_SRC_FILES := \
-       main_surfaceflinger.cpp
+     main_surfaceflinger.cpp
  
  LOCAL_SHARED_LIBRARIES := \
-       libsurfaceflinger \
-       libcutils \
-       liblog \
-       libbinder \
-       libutils \
-       libdl
+     libsurfaceflinger \
+     libcutils \
+     liblog \
+     libbinder \
+     libutils \
+     libdl
  
  LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain
  
@@@ -155,11 -153,13 +159,13 @@@ LOCAL_SRC_FILES := 
      DdmConnection.cpp
  
  LOCAL_SHARED_LIBRARIES := \
-       libcutils \
-       liblog \
-       libdl
+     libcutils \
+     liblog \
+     libdl
  
 -LOCAL_MODULE:= libsurfaceflinger_ddmconnection
 +LOCAL_MODULE := libsurfaceflinger_ddmconnection
  
+ LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
+ 
  include $(BUILD_SHARED_LIBRARY)
  endif # libnativehelper

diff --cc services/surfaceflinger/DisplayDevice.cpp
Simple merge