tree c62a9ce635f259a742f223ba9e0b90cd1a0863b7
parent fd87827bc8f052b8c6c4750baaef058e76081e8c
parent 75e671c77c7adb791de2fba9802142a2c2615ef9
author TreeHugger Robot <treehugger-gerrit@google.com> 1618848157 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618848157 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 5d4a124c24 -s ours am: 75e671c77c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I73ef845ae62676ea8703d8bd7cef754b016a7053