tree f75024b015e9f408125a4f84857db6521b8de3e3
parent 87ba565965ff49649c8dd0d17aa1b4da99609955
parent 5246dd693be393c692869575868768316c6431e8
author TreeHugger Robot <treehugger-gerrit@google.com> 1649958272 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649958272 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe67b54f3 -s ours am: 5246dd693b -s ours

am skip reason: subject contains skip directive

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

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