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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 788d9efaca -s ours am: 87b45b2ae8 -s ours am: 639c560c40 -s ours am: a5cef2c63d -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id466e0f86ab6e7de109e0544b5b64ecd209735c0