commit | 89a63f02f5d0814435e72b515b792bc6737014dc | [log] [tgz] |
---|---|---|
author | John Reck <jreck@google.com> | Tue Nov 25 15:38:24 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:38:24 2014 +0000 |
tree | d154f6cfce5fde3a4df3231bf0a339f26b94aa20 | |
parent | a05d4a4bb38df792cbf19a0f1e198a26f1509281 [diff] | |
parent | 0c31d97a38909e85e0df6cdc29469dbb1580ed4b [diff] |
am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev * commit '0c31d97a38909e85e0df6cdc29469dbb1580ed4b': Switch TextureCache to SkPixelRef::fStableId