tree 2d3c62662c1b50157a3c6c54481f3da8d228f84e
parent 9264a95608c08623f2955823703e5c77558cafa8
author egdaniel <egdaniel@google.com> 1421777962 -0800
committer Commit bot <commit-bot@chromium.org> 1421777962 -0800

Do more cleanup from xp changes

BUG=skia:

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