tree 9ac7f57fcae3799a47812a070fac83c06adbebac
parent 2ac940b2eba64a0941a66f2a2a0ec3b3a6205994
parent 1517224346e9e3e017401ec3f92bf30d98e5e995
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484796972 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484796972 +0000

Merge latest Skia into master (1 commits)

https://skia.googlesource.com/skia.git/+log/412a86d..1517224

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