tree ad9ff6c87843ee35027be42e154df89cd99656ab
parent 2cbc33de1b90e774ce6f9e6689e13fb14d9a7634
author Ben Wagner <benjaminwagner@google.com> 1480365037 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> 1480371694 +0000

Merge changes from internal cl/140385880.

BUG=skia:

Change-Id: I1c4994a83a1669032b8dc2620fd5c3258f82a222
Reviewed-on: https://skia-review.googlesource.com/5282
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>