tree 827c24e54b8049a0e07f28cf67048c632103d230
parent 075de580aa53f9fcb6731e869f638930034693fd
parent f87e2b95f098dd1b43f0704a95057818251d4b5c
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484847276 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484847276 +0000

Merge latest Skia into master (6 commits)

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

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