tree 8ec2e4568130d4bdbdf0a8b1858ed6db6d26a4ea
parent 2499c24cdafffd259b3afc86df5769b21e03bad8
parent 6a51fdd26455b67a3e0970d42ea35da212e95775
author TreeHugger Robot <treehugger-gerrit@google.com> 1630140511 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630140511 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 141d0eb0b0 -s ours am: d78234f545 -s ours am: 6a51fdd264 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I92104980db5d724a200d58405c2c23dc1e1fa8d2