| commit | 6a1763b983cced9830faaee28d59e35db1dd258c | [log] [tgz] |
|---|---|---|
| author | Brian Osman <brianosman@google.com> | Fri Nov 06 11:47:41 2020 -0500 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Fri Nov 06 16:51:49 2020 +0000 |
| tree | 0be2a38dcd36f9833bbc4be8075b41c8e1906a16 | |
| parent | 4eb7c23d5289df65281f3030f4ae3fc0ac28707b [diff] |
Fix merge conflict in RELEASE_NOTES.txt No-Try: true Change-Id: Ief2f5af2d7ea827f772c5ee1c32bae761fc8d60b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/332748 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>