tree bd44bbbf8dd45b9b5810c6f270906850080efa3a
parent 50c48df6a032b24b8c174550ae10a1efecd6a933
parent 5894a726c8b9550f85f845f5a4248dce2823f179
author TreeHugger Robot <treehugger-gerrit@google.com> 1593023425 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593023425 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 65baeccdd8 -s ours am: a2d39223f3 -s ours am: 5894a726c8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I56191cc0b6e3d6252b231d41b50fad23bebb6a37