tree 2912f82b5408bc55866f869fd69e0e89101390a3
parent 0bac4f69693d6c4671900b8bd554ea051e29537a
parent 3a97054456cd89cc885a7ce774523577dbe9164e
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1486414545 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1486414545 +0000

Merge latest Skia into master (13 commits)

https://skia.googlesource.com/skia.git/+log/be28ee2..3a97054

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