tree 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9
parent 3f704383a4c32bb14326ac4123fb7617e270e743
parent 95d691316cfdc34db4946428885ce8380ca26676
author TreeHugger Robot <treehugger-gerrit@google.com> 1594046083 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594046083 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8adc4f7f3f -s ours am: e9ae85a025 -s ours am: b419dee7d6 -s ours am: 95d691316c -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idecd822f903de8cd7fddcbceef2f450a3532d2ef