tree 37163bc00936460cee1184541cd10eb9b14651de
parent 3dc74ca2947e7c9750d5b4dd79c02d387cb08a41
parent 153cb48aa39c60fa5fed24f4d808f5423e1945d5
author Xin Li <delphij@google.com> 1599789765 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789765 +0000

[automerger skipped] Merge Android R am: 0cf39e4cde -s ours am: 153cb48aa3 -s ours

am skip reason: Change-Id I249e6ecc866b68d270cbe6066c8fcc4dfc2364a3 with SHA-1 57370d7fdc is in history

Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/1421757

Change-Id: Ifaab2241fc198b03d4503aeea5c250792c7233c9