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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fcb31eb491fb27b0417afa9485eee4215f1c8ab