tree 1cb7cf734cfe78cfc1c31ca67b4f7fe44c9a5819
parent 751cedcecb7eb8ff175f48ef5b9e8ab5a5ab5509
parent 9c842b680935b69734d2380defda199abef7bfc2
author TreeHugger Robot <treehugger-gerrit@google.com> 1604123959 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604123959 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 6803b3a128 -s ours am: 9c842b6809 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I21a573adc1b6c35761fac2ac18622b42bc6266d5