commit | 14c0c989d21531056a5d0a0739c3ffdd1b04b295 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 29 11:55:20 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 29 11:55:20 2012 -0700 |
tree | 84ffe6eb6938e31129e0ba713c4d453fa4d5e598 | |
parent | 15e099cc09589f963933f046d7267552ba3ffad8 [diff] | |
parent | 4ba4caede125ff602b0d93f577f9054a07791ff7 [diff] |
am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly" * commit '4ba4caede125ff602b0d93f577f9054a07791ff7': Fix SkBitmap::fPixels not being locked correctly