tree 1f2a8455bd9b074381392632a8411ad77a762492
parent 357e372f58fcd1ea3ae5447534d06716e09170a2
parent d615818816e002ace13d1227e6cbcbeb2c74f3bc
author TreeHugger Robot <treehugger-gerrit@google.com> 1616829040 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616829040 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ic53e0be4cebb26109b064c58b133bc82b62bdf41