tree e150aed347a3616105230f147f055563fa69d3f7
parent 827243c87b27154dbfefe6c30810a06906c9b045
parent 70a309aa055dad8b2e7a6cbd90774f44a7fcd5fb
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484757725 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484757725 +0000

Merge latest Skia into master (7 commits)

https://skia.googlesource.com/skia.git/+log/9c7dcac..70a309a

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