tree ac037279dfec81883c153b07c468bf8f925ae4ef
parent de8c9dd3763c997660ece0186ee32a46c868bf4b
parent 5416913dc37bc0d4c3c80f1b249acca7fb314685
author TreeHugger Robot <treehugger-gerrit@google.com> 1640285270 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640285270 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5416913dc3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5573241b2caae764542e3973b14a726ecda1a21a