commit 088c514cb13f3b8f8683588c2f398f18df1547c9
author John Reck <jreck@google.com> Thu Nov 06 13:04:49 2014 -0800
committer John Reck <jreck@google.com> Thu Nov 06 13:04:49 2014 -0800
tree 798905e133994e16fc1b66a8e6aedeab0eb98872
parent 1af72bff509bb2638c2d7a1309dbf3f03736e6fd
parent be70c7713df98d81e9e43af9e76e0e6d018a4339

resolved conflicts for merge of be70c771 to master

Change-Id: I469905bef7361c18aab725778694567d1987c06d

libs/hwui/DisplayListRenderer.cpp

diff --git a/libs/hwui/DisplayListRenderer.cpp b/libs/hwui/DisplayListRenderer.cpp
index c0b8a56..639ade7 100644
--- a/libs/hwui/DisplayListRenderer.cpp
+++ b/libs/hwui/DisplayListRenderer.cpp
@@ -21,7 +21,7 @@
 
 #include <private/hwui/DrawGlInfo.h>
 
-#include "Caches.h"
+#include "ResourceCache.h"
 #include "DeferredDisplayList.h"
 #include "DisplayListLogBuffer.h"
 #include "DisplayListOp.h"
@@ -33,7 +33,7 @@
 
 DisplayListRenderer::DisplayListRenderer()
     : mState(*this)
-    , mCaches(Caches::getInstance())
+    , mResourceCache(ResourceCache::getInstance())
     , mDisplayListData(NULL)
     , mTranslateX(0.0f)
     , mTranslateY(0.0f)