tree 813cb5a8698e532a410c1e2eca4fcdd94df1ff81
parent 2106d984d9b2e35155b441cb7d15d012f39debd6
parent e431b540ab2e108b0f79de0ba6ccdf53d67e7627
author Treehugger Robot <treehugger-gerrit@google.com> 1613499524 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613499524 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bda105c537d7605958656dd44ee29ef8b1558d0