tree 947a08310996766d6e3022739f12d404441e6e53
parent ff2ce8ac2de489aafe846d35a41e422313b8d1da
parent a938afe5d2d24214874a7eef653f20f17021c348
author Bill Yi <byi@google.com> 1632536592 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632536592 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3520f7482a -s ours am: a780c8afe5 -s ours am: 4648c36c57 -s ours am: 665f358efc -s ours am: d8e1470bd5 -s ours am: a938afe5d2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib207c5663a0c26ce6f9989061b803753313dda04