tree 690fbf0f42048cd4cb6cb51f60b274e4ea182e15
parent 8e4adb0e01bec32f7e4e02ea2a740e4fcddf7af6
author epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1358545542 +0000
committer epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1358545542 +0000

Roll out r7258
BUG=http://code.google.com/p/skia/issues/detail?id=1079
TBR=robertphillips
Review URL: https://codereview.appspot.com/7138065

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