tree 9f94a48821cd9749480ab0502f9b2baf7b99a2f1
parent 9ef89ce8b7eb270b37941553099654129f2e0a04
author senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> 1358545992 +0000
committer senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> 1358545992 +0000

Partial revert of r7287 to green up the bots.

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