tree 28169a55798faf6a56a07e06240325026647e801
parent 9fe287bd07baa6d9e890b627c102bba562954f7d
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1332863998 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1332863998 +0000

Reland 3503 with fix


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