tree 24f642b5fcf9628c5cd1e2a5fcc9d9bfd00a2eaa
parent b765e2a9fc28b8d2b492f0608ebb41a6353995d4
parent ab07d202e81d2e633d353c2015c89d6a3f301458
author TreeHugger Robot <treehugger-gerrit@google.com> 1592413595 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592413595 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 6e84264d63 -s ours am: fd8222c773 -s ours am: ab07d202e8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I995da36a8259cddbf5a3b943b1bd441155ed602d