tree f36e0f9da5855a1abb42f107a4e0733d79080e65
parent f44b8677aaf13983eae4a380721647683defa82e
parent 8d7f446201a585685415bd742d5d5585d76de2fc
author Treehugger Robot <treehugger-gerrit@google.com> 1613506294 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613506294 +0000

Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/marisa-trie" am: e431b540ab am: f091fdc072 am: 9568387c2d am: 8d7f446201

Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1588941

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3efd5b931af72cf5f54b33132bf063d561973dc