tree a8fbac0a84569727856e84d77fa4319050eb5e26
parent 8f9cbd62ec108d410b91155dcf6a4789c641246f
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1323447024 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1323447024 +0000

roll more changes from r2830 back in


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