commit 7dbaaf19eb3c2abde55a7082a2bfcea059dc8b72
author Zhiquan Liu <zhiquan.liu@intel.com> Thu Mar 03 15:41:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 03 15:41:49 2016 +0000
tree ef380d9bc8834e28bb26dc7ea82dd8cd9c4826a7
parent 0e93732cf1b32fb001d4e99e6f49b97aab91a247
parent e6b6843c5fc19976677706518c4875a78cc736bb

Merge ""#warning" conflict with -Werror"
am: e6b6843c5f

* commit 'e6b6843c5fc19976677706518c4875a78cc736bb':
  "#warning" conflict with -Werror

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 5ff79a9..4a701e8 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -134,7 +134,6 @@
     mSurfaceFlingerConsumer->setName(mName);
 
 #ifdef TARGET_DISABLE_TRIPLE_BUFFERING
-#warning "disabling triple buffering"
     mSurfaceFlingerConsumer->setDefaultMaxBufferCount(2);
 #else
     mSurfaceFlingerConsumer->setDefaultMaxBufferCount(3);