tree e07b11fa000c7bbcb865283bb712e3898d4f06bf
parent 4d72ea3d06c27594f765f751396c8b6e5bd3aa49
parent b74579eb2a3b3c4aa4c9a490bc299df1274bb532
author TreeHugger Robot <treehugger-gerrit@google.com> 1612377579 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612377579 +0000

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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I547d23e267293d28b1db456b32d3a8e8879b8a04