tree 6139a092cc23a3123640d6be55ca80e56dcd51b8
parent 8b39f8f2bcbcd5f95908c34edb3cc70816c949b0
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1326834185 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1326834185 +0000

Attempt to reland 3054


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