commit 13a2639165c561c5b83ba4a0d66f9bfa038d3830
author Marco Nelissen <marcone@google.com> Thu Mar 20 20:57:08 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 20 20:57:08 2014 +0000
tree fe85542872b6697fc3c04738c3a3e6e6bd6f9fb7
parent ffb3e595cc4adbe0c31887e42e2200b77d93a024
parent 113847c3f4e6774f991cfa9dcd73e9c53e26bd0e

am 113847c3: am 46b26641: am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev

* commit '113847c3f4e6774f991cfa9dcd73e9c53e26bd0e':
  Verify certificates

libs/hwui/TextureCache.cpp

diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp
index a9ab2c6..d5ba8c3 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;
     }