tree 452050b7aa79cf5b02b559bf40eef942072338b8
parent c12c047eab878678be5eb452ddfa0cded89df7d4
parent 8dadd9e8936a1c8f44fccdfde7f883dfe2d89c96
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484747184 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484747184 +0000

Merge latest Skia into master (1 commits)

https://skia.googlesource.com/skia.git/+log/d4bdee5..8dadd9e

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