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

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 57370d7fdc -s ours am: 3dc74ca294 -s ours

am skip reason: Change-Id Id80265833a6189f7145604c4deae78294f930512 with SHA-1 7e7402f113 is in history

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

Change-Id: I3b87bbe4c62f41d37d266bb5558148c9e898217a