tree dbb6dc186f0178907dd63c6a360aa41586e93c77
parent b43c3c0388fe50271eff20ae8d19f6127bffdbe8
parent 27bdd0c39b7c46f2176ae91e3fe1d5250d0cdc4e
author TreeHugger Robot <treehugger-gerrit@google.com> 1593928293 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593928293 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I5b458c89c576b29f3cb314840f529fb0d827e4dc