tree 7fc52d413a6309a0f22980979f2394e9c60f5d59
parent 1ea67b0c986d1ef6709b9f388c479fbda82f7fd5
parent e0b7f6bcc6189284254636dd23518c76a1886e44
author TreeHugger Robot <treehugger-gerrit@google.com> 1618846398 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618846398 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Id695ec2deb2b6cb12b3856bbb30ec71d6f42004f