tree c257b1c7cdff4ef9c5a355b76b4f70fbd39e383a
parent 081b46325b953aaa14aa2bbfe1ae0cb0dc1a9073
parent 412a86d014783be99a7a9a0fae407791b95806e8
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484779889 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484779889 +0000

Merge latest Skia into master (4 commits)

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

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