tree f2d871c81b4e594e1d1a2e675bf62b40733e14e2
parent 614329dbad99cb14b49b4316ec2221e7a735ce11
parent 9f43334aabe9ea561ea57997fffd36f2d417dff2
author TreeHugger Robot <treehugger-gerrit@google.com> 1631436942 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631436942 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7dd228c650 -s ours am: 9f43334aab -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iafad41b0a0df4ea69ba1bc01a1a2e4b485598d52