commit 58f138542c0e43b62153fd8876874cce3e5169b4
author Yi Kong <yikong@google.com> Thu May 04 16:06:01 2017 -0700
committer Yi Kong <yikong@google.com> Thu May 04 16:07:10 2017 -0700
tree 08bcc79a502f900b98737e6a47975384d6ed37f3
parent 35c170928c235e5066d503014a6c08eebbfa83e2
parent 3a75c70a06795ff2d563d3828351ff7c8656c75a

Merge commit '3a75c70a06795ff2d563d3828351ff7c8656c75a' into manual_merge_3a75c70a0

Test: Build
Change-Id: If6409a707e1d76a56c445a6286ea5dbde29e7a71

include/gui/BufferQueueProducer.h

diff --git a/include/gui/BufferQueueProducer.h b/include/gui/BufferQueueProducer.h
index 5541468..460993c 100644
--- a/include/gui/BufferQueueProducer.h
+++ b/include/gui/BufferQueueProducer.h
@@ -30,7 +30,7 @@
     friend class BufferQueue; // Needed to access binderDied
 
     BufferQueueProducer(const sp<BufferQueueCore>& core, bool consumerIsSurfaceFlinger = false);
-    virtual ~BufferQueueProducer();
+    ~BufferQueueProducer() const;
 
     // requestBuffer returns the GraphicBuffer for slot N.
     //