tree 458af04d92cb78c5ab4919448345651eb2a102b4
parent d471666e0b331f0b0fdf8a87f468d65380fa3f0a
parent 52b346e34dc948aeea4ddede0a256bb673ff4a7e
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484841408 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484841408 +0000

Merge latest Skia into master (3 commits)

https://skia.googlesource.com/skia.git/+log/4897fb8..52b346e

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