tree 561749b3430cb193d422f50de3dbf5cac6991c23
parent cfa3fb31acdda46e6b5c4bd6cee3f84acdc3e3e5
parent eec3cdbd5c20e2f49cdfbf160dd661895388fff3
author TreeHugger Robot <treehugger-gerrit@google.com> 1593983609 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593983609 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 97455bb190 -s ours am: f8c9fc05fc -s ours am: eec3cdbd5c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I98f71e847f83aa5d5083c6f01845de060f361803