tree eda1c89e885758448fc5b4d22c5f2c2c203ae2a5
parent b303fffa165840afdba12dcf6e8427b784b4045b
parent 81442712aad57c136ec8a581cdc2c20588925c5f
author TreeHugger Robot <treehugger-gerrit@google.com> 1598479676 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598479676 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 81442712aa -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6cf228c0b02c0fdde167362d4db247691268dfbe