tree ef8e7086864862f2347ff45dad776182fdfd46f7
parent b89f52e475b73634e663a4ee074c9a6379430ffc
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1364216617 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1364216617 +0000

land https://codereview.chromium.org/12676024


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