resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp

Change-Id: I0be2ecb8085f2cd9560138460bcc27d71c011608

diff --cc services/surfaceflinger/Android.mk
index 13d1a55,eade2e2..1eb2361
--- 1/services/surfaceflinger/Android.mk
--- 2/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@@ -90,28 -90,24 +90,26 @@@ els
  endif
  
  LOCAL_CFLAGS += -fvisibility=hidden -Werror=format
- LOCAL_CPPFLAGS := -std=c++1y
+ LOCAL_CFLAGS += -std=c++11
  
  LOCAL_SHARED_LIBRARIES := \
 -      libcutils \
 -      liblog \
 -      libdl \
 -      libhardware \
 -      libutils \
 -      libEGL \
 -      libGLESv1_CM \
 -      libGLESv2 \
 -      libbinder \
 -      libui \
 -      libgui \
 -      libpowermanager
 -
 -LOCAL_MODULE:= libsurfaceflinger
 +    libcutils \
 +    liblog \
 +    libdl \
 +    libhardware \
 +    libutils \
 +    libEGL \
 +    libGLESv1_CM \
 +    libGLESv2 \
 +    libbinder \
 +    libui \
 +    libgui \
 +    libpowermanager
 +
 +LOCAL_MODULE := libsurfaceflinger
 +
 +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
  
- include external/libcxx/libcxx.mk
- 
  include $(BUILD_SHARED_LIBRARY)
  
  ###############################################################

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