tree fc2bab5645c9cab799b6b5fce4cf32f7f382996a
parent 1b0611e00f4218e49cdb2840951c1aee53380539
parent 45b0fd79693100cc020fc66d6b918871c546c2bd
author TreeHugger Robot <treehugger-gerrit@google.com> 1584609936 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584609936 +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: I65573286fed29bf28c2ad566c6a069d877e0b2d6