tree 5cfa82fd29a4580dac263fc70c60f1cdac87923e
parent 1a6fe3c121119fa31cbc4c5180a3d590e2b8255f
parent 4337a99f39b536a845a7cfdc55361221fcc9ea34
author TreeHugger Robot <treehugger-gerrit@google.com> 1641865259 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641865259 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 29ba6cf2ff -s ours am: ba5dd4122a -s ours am: 4337a99f39 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0bde05d9c7d1827d7ec0994214cbbd656ecdc91d