tree cd4f05c3fdef47db55834b48ec0f0dfc2983b7ee
parent daa2db793a096cd124aa75acc5156134c464d39f
parent c01389271162d08303088732c30f419807f25d33
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1488997481 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1488997481 +0000

Merge latest Skia into master (4 commits)

https://skia.googlesource.com/skia.git/+log/b357dea..c013892

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