tree f36e0f9da5855a1abb42f107a4e0733d79080e65
parent c50836e5bf1c803aebd62f0399299953b97442f9
parent 1427082ca913e29560fc7cc83f7cadc54878cc99
author Xin Li <delphij@google.com> 1633657164 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657164 +0000

[automerger skipped] Merge "Merge Android 12" am: 0056347f7d -s ours am: 1427082ca9 -s ours

am skip reason: Merged-In Ib84685c96ac6b9448656882a2ad963b7248f3804 with SHA-1 f1b61e748b is already in history

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

Change-Id: Ifb7003d1c92f238dee627e066f275e2d8f263fb3