tree 39939cf1a5e589ba5f3693c0760cc0eeeb1bcfe7
parent f10dc5371a46b4dc9f9b3d994141c22a5f8ec295
parent 4897fb898f62a983829e56fc72b5ce6fd1ad62e4
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484834892 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484834892 +0000

Merge latest Skia into master (1 commits)

https://skia.googlesource.com/skia.git/+log/1517224..4897fb8

Test: Presubmit checks will test this change.
Change-Id: Ia62b8a9b650a056bbfc1ab56683a63bfe1d1bd8a