diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-29 12:00:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-29 12:00:10 -0700 |
| commit | 38f197863a07cd600b45d752fdfa949d8b2e6fa6 (patch) | |
| tree | 53ba9890729b7876af7eacb284d13c9ff6fe5fcf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c88a80a1d7a35eaefb54d17b60e9d3a07b800e82 (diff) | |
| parent | 14c0c989d21531056a5d0a0739c3ffdd1b04b295 (diff) | |
am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
* commit '14c0c989d21531056a5d0a0739c3ffdd1b04b295':
Fix SkBitmap::fPixels not being locked correctly
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions