tree 210e92b065d18b3a9562a12d4c5ec0242e52c1ed
parent b699a2cac29d6426cf1fee3fe7977b52d7acd3a9
author Aurimas Liutikas <aurimas@google.com> 1463440134 -0700
committer Aurimas Liutikas <aurimas@google.com> 1463440134 -0700

Re-add marisa-trie depencency as it is used internally.

Fixes dalvik-dev branch.