diff options
| author | 2012-01-09 23:24:46 +0000 | |
|---|---|---|
| committer | 2012-01-09 23:24:46 +0000 | |
| commit | 2e681c1b097883f5c327d3c1c77692ecab498a35 (patch) | |
| tree | 7dbf619f6a4e81fd615afc51f5a3b8a4441b167a /libs/hwui/TextureCache.cpp | |
| parent | 293fa718102353d7b103f10a7c0f580ba87b3a0f (diff) | |
| parent | 08289f55eae5c4127091360e862f78d57ae24c15 (diff) | |
resolved conflicts for merge of 08289f55 to graphics-dev
Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
Diffstat (limited to 'libs/hwui/TextureCache.cpp')
| -rw-r--r-- | libs/hwui/TextureCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp index 3f46a3017396..cc09aaec32d4 100644 --- a/libs/hwui/TextureCache.cpp +++ b/libs/hwui/TextureCache.cpp @@ -202,7 +202,7 @@ void TextureCache::generateTexture(SkBitmap* bitmap, Texture* texture, bool rege SkAutoLockPixels alp(*bitmap); if (!bitmap->readyToDraw()) { - LOGE("Cannot generate texture from bitmap"); + ALOGE("Cannot generate texture from bitmap"); return; } |