tree c75c167b92a681888564f683f36a637e99390631
parent c6e25dadfcd405727dfa6e1991a90db96bf6702b
parent 7080c27189836c8451396a3ddfa5e86525083151
author TreeHugger Robot <treehugger-gerrit@google.com> 1628365172 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628365172 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Iaf15798f03cd4bc365fd8f4a0338d17bd4aaefad