tree 37163bc00936460cee1184541cd10eb9b14651de
parent a5d31240d2da0e7eb78b21a9a5c1642cb62800f9
parent f94746a70ad2bb6e9cb2244ff08657b185f806e2
author Xin Li <delphij@google.com> 1599796746 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796746 +0000

[automerger skipped] Merge Android R am: 0cf39e4cde -s ours am: 153cb48aa3 -s ours am: d311fae26e -s ours am: f94746a70a -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: I199f899e4ea05302de2b651498e9953c465b0d7c