commit c32a98b8cc09687a031ed969e39df593bf483459
author Deepanshu Gupta <deepanshu@google.com> Tue Mar 11 23:43:26 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 11 23:43:26 2014 +0000
tree 6af1407518f2d72802e612757803c959acda5453
parent 81686bd93c15f0129de27e1b2a2e025e0b4112b4
parent f978f16e50374681b0ade2d14a5e39cedaea6c2f

am f978f16e: resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp

* commit 'f978f16e50374681b0ade2d14a5e39cedaea6c2f':
  Fix the delegate method signatures in LayoutLib

libs/hwui/TextureCache.cpp

diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp
index 54a206b..ad235a9 100644
--- a/libs/hwui/TextureCache.cpp
+++ b/libs/hwui/TextureCache.cpp
@@ -184,7 +184,7 @@
     Mutex::Autolock _l(mLock);
     size_t count = mGarbage.size();
     for (size_t i = 0; i < count; i++) {
-        const SkBitmap* bitmap = mGarbage.itemAt(i);
+        SkBitmap* bitmap = mGarbage.itemAt(i);
         mCache.remove(bitmap);
         delete bitmap;
     }