resolve merge conflicts of f1df0f59c1 to master.

Change-Id: Ia0ae0f753541f5203a4a3683721361c5e90ddae8

2 files changed, 2 insertions, 2 deletions

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 94a11f131229..eaa1c330d5dd 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -103,7 +103,7 @@ void Caches::initStaticProperties() {
 
 void Caches::terminate() {
     if (!mInitialized) return;
-    mRegionMesh.release();
+    mRegionMesh.reset(nullptr);
 
     fboCache.clear();
 
diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp
index 489ebc116a2a..0fe20ad1b662 100644
--- a/libs/hwui/Layer.cpp
+++ b/libs/hwui/Layer.cpp
@@ -248,7 +248,7 @@ void Layer::defer(const OpenGLRenderer& rootRenderer) {
 void Layer::cancelDefer() {
     renderNode = nullptr;
     deferredUpdateScheduled = false;
-    deferredList.release();
+    deferredList.reset(nullptr);
 }
 
 void Layer::flush() {