tree e0ab92ba879065bb93d8a9ca1f6e0efcc918426c
parent 5c1e74b01c8e3dd34437d35cb47b44d127663faf
parent 9e372aa25c7038cc1afb3c3a56d8f5bee76177d4
author TreeHugger Robot <treehugger-gerrit@google.com> 1622141336 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622141336 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ia79896667a1998a2db1d8a624b4025b1bb2c9293