commit 31aa077226b8d9d65d351ddb92a01273d9830070
author Christopher Tate <ctate@google.com> Wed Mar 05 01:08:46 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 05 01:08:46 2014 +0000
tree 5b7e4a120ffe3dac8e84d09c179305ce17420b45
parent bf588bda2c4dc98919439946e905e98ad4d352dd
parent 7a4e519eda4e0e7bac9ad0159b29b11f61b50e01

am 7a4e519e: am 8106dce7: am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev

* commit '7a4e519eda4e0e7bac9ad0159b29b11f61b50e01':
  Update PackageMonitor to recognize new 'replacing' semantics

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;
     }