tree 8042ca2005969c794c4bf43c48ef9345e7d037d1
parent ee0cac336c6a3a357ae3cb18be8ef4b3cb5edddb
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> 1400248076 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> 1400248076 +0000

Rebase for https://codereview.chromium.org/283803003/
NOTREECHECKS=True
NOTRY=True
R=bsalomon@google.com
TBR=bsalomon@google.com
BUG=skia:

Author: egdaniel@google.com

Review URL: https://codereview.chromium.org/291483008

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