tree 82889e332ab2a2461ac5b4c3595e73d8dca2114e
parent 029d2741d5a885405365dd0d002c95df8fdd6572
parent 86a43405fb3f83f6d45581959df5f7321487ae7e
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484857172 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484857172 +0000

Merge latest Skia into master (7 commits)

https://skia.googlesource.com/skia.git/+log/f87e2b9..86a4340

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