tree fbf29efc7f5d37459a166b1868270598c73b90f2
parent 40e2c8c362278792594ce32288f722f5f3c1ea02
parent d1a29c38bb7318a525188987c240ea40cf4ab10d
author TreeHugger Robot <treehugger-gerrit@google.com> 1637264615 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637264615 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I838f134de6f4dc3f9a81bafd3d235691a9f405dc