tree dba7131f528dead2535d29f219cb7aad11c4b067
parent f878ebce5a2992b0bcdda5b2400fd58a24aa7851
parent 9a70036bde1f0044f0d1c91c7d28bba533647828
author TreeHugger Robot <treehugger-gerrit@google.com> 1624739029 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624739029 +0000

[automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am: 0012f0daae -s ours am: 41378ed286 -s ours am: afd2af6f87 -s ours am: 5cf0bcff67 -s ours am: 72a39d4416 -s ours am: 9a70036bde -s ours

am skip reason: skipped by user nona

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909231

Change-Id: I4f9bb8ec7d777ba1ab686e1799bc97b99360a4d0