tree 25ffb948c3b4ccbe006c9d2be1c512932f6d0fd9
parent de1d8dd1dd3650eb10de875c2a0e5fa434e8b2df
parent 5d4aea692c574a06c6934df49c4c9195941c864e
author Bill Yi <byi@google.com> 1644351357 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644351357 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f67b906f06 -s ours am: 5d4aea692c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I73f8277e67e3a05af4782ad707af2e216c631b87