commit | 59f9edb321ea29f7349bd4f13f3473e54831598a | [log] [tgz] |
---|---|---|
author | Ben Wagner <benjaminwagner@google.com> | Mon Nov 28 15:30:37 2016 -0500 |
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Mon Nov 28 22:21:34 2016 +0000 |
tree | ad9ff6c87843ee35027be42e154df89cd99656ab | |
parent | 2cbc33de1b90e774ce6f9e6689e13fb14d9a7634 [diff] |
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>