commit | d87a98f1968e63a9e273974e700f7afcf5fd4cd1 | [log] [tgz] |
---|---|---|
author | Leon Scroggins <scroggo@google.com> | Fri Apr 30 15:12:36 2021 -0400 |
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Fri Apr 30 20:03:22 2021 +0000 |
tree | 2ec48ef117ff64de97bca586114a1b6866f7b4bd | |
parent | 5567862bda1f6f60006fa3f6b49cfef98f08c2d5 [diff] |
Add LOCAL_LICENSE_KINDS to external/skia Bug: b/68860345 Bug: b/151177513 Bug: b/151953481 ag/Iead63ec340208211058d0a04ed4e476af6cd51b0 added these to Android.bp, resulting in merge conflicts. After that is reverted, we can land these here unchanged to get the same effect, without conflicts. Change-Id: Ia9e3970564dca014e4f144fba9e3da4f0c174e7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357277 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com>