tree 1a2e54d396a7187eba6b4ade5081e946a9b98d78
parent ca0077f77478270a982ce11bbf3bd9ae02d3eaf5
parent 0d1cb2835b4c6c7a6988fa52a6373b1339473f0d
author TreeHugger Robot <treehugger-gerrit@google.com> 1595882993 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595882993 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Iee1f91fc4dbb6a91a7e94bb1336ccce2ceb24dcc