resolved conflicts for merge of 220c3f4f to master

Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e

1 files changed, 1 insertions, 1 deletions

diff --git a/libs/hwui/TessellationCache.cpp b/libs/hwui/TessellationCache.cpp
index 1e38f9e9e615..35ec5e932733 100644
--- a/libs/hwui/TessellationCache.cpp
+++ b/libs/hwui/TessellationCache.cpp
@@ -365,7 +365,7 @@ void TessellationCache::clear() {
 // Callbacks
 ///////////////////////////////////////////////////////////////////////////////
 
-void TessellationCache::BufferRemovedListener::operator()(Description& description,
+void TessellationCache::BufferRemovedListener::operator()(Description& /* description */,
         Buffer*& buffer) {
     delete buffer;
 }