tree f990ed0f0d79eca334b7f193a4df1af47ce0501b
parent ca57f1d91bcac6bfed94b3a1e41d5d87143a4dc5
parent 652ecb51624941545aaedcea47bf51b314738c9c
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484678818 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484678818 +0000

Merge latest Skia into master (3 commits)

https://skia.googlesource.com/skia.git/+log/3f142b6..652ecb5

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