tree f36e0f9da5855a1abb42f107a4e0733d79080e65
parent 0ae4243ce441c21548e0f5f27027476c843c7064
parent d6fb3b13f6f6b6e7abaecde094df3d30edb7f1a7
author Xin Li <delphij@google.com> 1633679799 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679799 +0000

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