tree faa490fe5bc0c4e92a57b565e0c9b1440dc90b0e
parent 80e34a6b69ae9099c216f6d3cf4ab34aa1bdb2b5
parent e4ee99b6ce8828b2954396d340b9fe279ade2266
author TreeHugger Robot <treehugger-gerrit@google.com> 1629234257 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629234257 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ieb05c5a9a2c333c92966c2d345fffde1436c376e