tree 305feb8fd00d9fc696e43f4ded4e625d00f56303
parent 92ead138e496d9806f13074d8a4df070e71f6996
parent f42217e10bf82646678faa75b0cee2571be3900b
author TreeHugger Robot <treehugger-gerrit@google.com> 1640626697 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640626697 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: f42217e10b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I16ded8d0a689bedd542fc4acadbac303b8822957