tree de354f4e9fac8b3266752bb5e90721fbca52d291
parent 40a1ff73a1150dbf03f8c950739002199c3912aa
parent a0b6f10b5a3784d63978dfd9746f58ef3d09838a
author TreeHugger Robot <treehugger-gerrit@google.com> 1633209808 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633209808 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I8c1b299d777d54590945274cfb298c36f71a87bb