tree 5e17556547d20541f57b86d43210d21f4ebef0bb
parent 794dee40c10867c7747de2cfb62974d5bce8700a
parent 6ec12e6774f729ae962f520c44f55e54531a0fd8
author TreeHugger Robot <treehugger-gerrit@google.com> 1594495288 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594495288 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7a33282392 -s ours am: 6ec12e6774 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icb2f86e805924bb98758f6e4fce96daa72a24edf