tree 3316a38aa60314eee01c97f2dee29cf4749afaab
parent 10911b130ef23b237347c8c3ad9aac0f3a9a0b6b
parent 758ffa04759a65f93cabb7a1a193ae03f9e9a75b
author TreeHugger Robot <treehugger-gerrit@google.com> 1625085545 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625085545 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 758ffa0475 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I91f8360c168f4e7468c18e1490ed4c8cd2fe3152