tree 64f8d10db998c678fdbcee79ae12fdacbca0eae9
parent 9efbd07ded8cb39ce43360138e8c8e2bd2e3a96b
parent 2eb1e5c42aa38ab16d4d45ac179b63138399199d
author TreeHugger Robot <treehugger-gerrit@google.com> 1584610661 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584610661 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: b4197095a3 -s ours am: f82a40ce47 -s ours am: 45b0fd7969 -s ours am: 2eb1e5c42a -s ours

am skip reason: subject contains skip directive

Change-Id: I35910ec6f468e355bac6ad3041602dc3c9b12e8d