tree df3e2531dbc2062eab1729f982bdb9036443d365
parent bb86ff5aedad8284917940a24b39dfe6bf755b35
parent fba588f2e26e618e99b5848fcdf07334d2a72a01
author Treehugger Robot <treehugger-gerrit@google.com> 1625421100 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625421100 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 412c317683 -s ours am: 6946d7a0fa -s ours am: fba588f2e2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id0f360caf5e9d84adf6d8935d5da677743492dc7