tree a3479b8adc72529d1aa97410be1d4adad47cd1f1
parent 3c15a3789a92adebb3a63e39eea8673b5ab01e93
parent 874a8725860cd2dc860967ee8069316d95de607c
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484767801 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1484767801 +0000

Merge latest Skia into master (3 commits)

https://skia.googlesource.com/skia.git/+log/0831f1b..874a872

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