commit e920322ff0c67cdd9e9682fd7c7df5221a6fb13e
author Mike Lockwood <lockwood@google.com> Fri Mar 21 01:25:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 21 01:25:54 2014 +0000
tree 0fdbd2395f2268ec4c082aefef64f55619b72420
parent 3b6689c010edd2deaf112f4d4239deeb2a244ea5
parent 861196030145ac2a5c9c2abd2c22272cc94fe884

am 86119603: am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev

* commit '861196030145ac2a5c9c2abd2c22272cc94fe884':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"

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