tree e1d2ee674198a01f1176865b3d4e1cca08f41d37
parent 135489a1d9396dfdc9c64bb92d23dfad49123ab2
parent f1bd633fec7564c5aa99d690ee99ffb9782c9410
author Julia Reynolds <juliacr@google.com> 1680042917 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1680042917 +0000

[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: f1bd633fec -s ours

am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647

Change-Id: I16d62672bad5e2fe6f7a392355f05d32eb7df2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>