tree 6099dee09e40beed726e2f6d300485935b73cbb2
parent 7426743837051f43dbc1209775b391b917c69c54
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1346353894 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1346353894 +0000

Recommit r5350 with fix for image failures (which affected GLs that don't support ARB_texture_swizzle).


git-svn-id: http://skia.googlecode.com/svn/trunk@5353 2bbb7eff-a529-9590-31e7-b0007b416f81