diff options
author | Bob Badour <bbadour@google.com> | 2021-01-22 02:45:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-22 02:45:57 +0000 |
commit | f44b8677aaf13983eae4a380721647683defa82e (patch) | |
tree | a5770ea2b89a8f9c36d70946f01ffe0f81f9906f | |
parent | f2c78ea62cf0e796e50a22c97bf4810218f7ba65 (diff) | |
parent | 2340e8d75d1bb53df5d9267805c2f245fe8ab216 (diff) | |
download | marisa-trie-f44b8677aaf13983eae4a380721647683defa82e.tar.gz |
Merge "Fix license_type. "AND GPL"" am: 2755ec422c am: 2106d984d9 am: 2340e8d75d
Original change: https://android-review.googlesource.com/c/platform/external/marisa-trie/+/1556647
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I140605d29733da43e8e1e441746a45d174a8e9a0
-rw-r--r-- | METADATA | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -13,5 +13,5 @@ third_party { } version: "v0.2.6" last_upgrade_date { year: 2020 month: 7 day: 17 } - license_type: NOTICE + license_type: RESTRICTED } |