diff options
| author | John Reck <jreck@google.com> | 2014-11-06 13:04:49 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-11-06 13:04:49 -0800 |
| commit | 088c514cb13f3b8f8683588c2f398f18df1547c9 (patch) | |
| tree | 798905e133994e16fc1b66a8e6aedeab0eb98872 /libs/hwui/Caches.h | |
| parent | 1af72bff509bb2638c2d7a1309dbf3f03736e6fd (diff) | |
| parent | be70c7713df98d81e9e43af9e76e0e6d018a4339 (diff) | |
| download | frameworks_base-088c514cb13f3b8f8683588c2f398f18df1547c9.zip frameworks_base-088c514cb13f3b8f8683588c2f398f18df1547c9.tar.gz frameworks_base-088c514cb13f3b8f8683588c2f398f18df1547c9.tar.bz2 | |
resolved conflicts for merge of be70c771 to master
Change-Id: I469905bef7361c18aab725778694567d1987c06d
Diffstat (limited to 'libs/hwui/Caches.h')
| -rw-r--r-- | libs/hwui/Caches.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/hwui/Caches.h b/libs/hwui/Caches.h index 7bb5c4a..4b8b626 100644 --- a/libs/hwui/Caches.h +++ b/libs/hwui/Caches.h @@ -342,7 +342,6 @@ public: TessellationCache tessellationCache; TextDropShadowCache dropShadowCache; FboCache fboCache; - ResourceCache resourceCache; GammaFontRenderer* fontRenderer; |