tree d49c8842bca917136730a799a4e2fbd756c53633
parent 7e051f9305ef2aec31167dfb8c18e59403701836
author mtklein <mtklein@chromium.org> 1424974455 -0800
committer Commit bot <commit-bot@chromium.org> 1424974455 -0800

Spin off some fixes to land right away.

BUG=skia:

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