| commit | 489530e06cb7dde13db1271dbf55452d79cd119d | [log] [tgz] |
|---|---|---|
| author | Ben Wagner <benjaminwagner@google.com> | Mon May 01 11:09:18 2017 -0400 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Mon May 01 15:18:55 2017 +0000 |
| tree | b260f0f29977cad10c9f8bbc8664c9a740748b51 | |
| parent | 8d9201a798049e277b6b29f16e9a659d9b63d1fb [diff] |
Fix merge conflict. I accidentally caused a merged conflict between https://skia-review.googlesource.com/14656 and https://skia-review.googlesource.com/14821 No-Try: true Change-Id: Ib00b293019fddc3951a5d413744b9d186dd103d8 Reviewed-on: https://skia-review.googlesource.com/14840 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Ben Wagner <benjaminwagner@google.com>