tree 64f8d10db998c678fdbcee79ae12fdacbca0eae9
parent 8a6f6341acd21c407442e8d41cd8ff022d54f473
parent 45b0fd79693100cc020fc66d6b918871c546c2bd
author TreeHugger Robot <treehugger-gerrit@google.com> 1584609916 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584609916 +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 skip reason: subject contains skip directive

Change-Id: I5d07f46ccfd99108f0813133f8a8518f297e8b6e