tree 9c12fa97a80d9cf5e773498eb11fd0e152fab486
parent b51dfd97e19bac9368de9878135bcd66f7e8ddbc
parent 8fc5e68a644dde1ffdbc503ec5a0615b5b954f27
author Xin Li <delphij@google.com> 1599013624 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599013624 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 737a78d493 -s ours am: 2884fb8e18 -s ours am: 9202ba7275 -s ours am: 354a2513c0 -s ours am: 8fc5e68a64 -s ours

am skip reason: Change-Id Ib9a00cd1def83755029fd97eefafd791f38dc5bc with SHA-1 cad8a32807 is in history

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

Change-Id: I78cd17d1b5afde8db86e9cdb2aa4d209c5217464