tree d7f1ad60bd8bc32410b1e187fd54ccff84f0ae69
parent 50e16da810b1b13f8e211cfe4b950a745181562f
parent d46697ac36d5cb3b58571c6129cb5b26fe9d25d7
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1485368954 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1485368954 +0000

Merge latest Skia into master (2 commits)

https://skia.googlesource.com/skia.git/+log/58abc9e..d46697a

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