tree f36e0f9da5855a1abb42f107a4e0733d79080e65
parent 02c3e0d86dea74bd0cbab797d70d0b6899d1ea5f
parent d743d2b4f6f038eb5654b7fda1478958cf99db78
author Xin Li <delphij@google.com> 1633683588 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683588 +0000

[automerger skipped] Merge "Merge Android 12" am: 0056347f7d -s ours am: 1427082ca9 -s ours am: d6fb3b13f6 -s ours am: 0ba11cd54d -s ours am: d743d2b4f6 -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: Ia008903752f8943c32dde0a89cf4a6ceecc403fc