tree 2f111c8c1a3612391f25bf8aabb6991872ebfd37
parent 2ba557341e64b0b011c82bdbe45a07c730437dd8
parent a7d61a65ee7f7b2a2f6fce59faaca0762cef4c67
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484683776 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484683776 +0000

Merge latest Skia into master (3 commits)

https://skia.googlesource.com/skia.git/+log/652ecb5..a7d61a6

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