tree 540d5b936cc5462144840e9a7ab9cdcd3e26387b
parent be44c378c3dfa095c61c998726d036fcf73b0f59
parent 78dc808624797c1ea1477abcc77b26a1b712c047
author TreeHugger Robot <treehugger-gerrit@google.com> 1618720249 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618720249 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 78dc808624 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic30cf3ce8e697df9562e45d19015df7b362323b5