tree 16eab9c4e23c14415431457f950126b0b0274663
parent fa09670b8c25034e13d1a12eb165d8f2f214df6a
parent bc8b870cd7ec881b9d37963b25e870f4ea4359e6
author Xin Li <delphij@google.com> 1598559609 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598559609 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cdb7a341d4 -s ours am: 570fb1d38e -s ours am: 43c2a7b282 -s ours am: bc8b870cd7 -s ours

am skip reason: Change-Id Ic91ee1134eb9cc96b09970635ad26da3e0246910 with SHA-1 010600680d is in history

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

Change-Id: I6e6dc73b3e688bb202b6a4270698d24261695afb