tree 9872154828f30a1e53e89b11142f8f06609049c6
parent 032fbb8ebff7816793b077b6113de702e48713c1
author epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1363873794 +0000
committer epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1363873794 +0000

Re-land r8269, fixing build errors/warnings
Review URL: https://codereview.chromium.org/12886037

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