tree 8d856116994b75150274e64d70e4b8a7c3444802
parent e197f1fc019721252d0bbc74c0b003653e743c1f
parent 682e0ad84c51ce98a641091f84246a2684ba13f5
author TreeHugger Robot <treehugger-gerrit@google.com> 1643264967 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643264967 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4a3fbd5851 -s ours am: 8157eb692a -s ours am: e37bdf522a -s ours am: 682e0ad84c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5412dbaf17dbe7b318278b8e0e84bc21a9c01b61