tree 37163bc00936460cee1184541cd10eb9b14651de
parent 1304887f111273a6b7c73f770c4cf27768437cf5
parent 4943bfb4b857e3e160d54ca4d405d99a087dd2b5
author Xin Li <delphij@google.com> 1598998203 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998203 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 57370d7fdc -s ours am: 3dc74ca294 -s ours am: 4943bfb4b8 -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: I8c02f79df17588344b74b0d2f9b8e4183712b70c