Manual SVN revert of https://code.google.com/p/skia/source/detail?r=14905



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