tree 0d589f942ded5ca734691ba2939a3716457c8859
parent ff944d5c133ab5d2ba094d6165e507466b7be41e
parent 46b8242ff05fcbe40d1c16270c87049fab076b17
author TreeHugger Robot <treehugger-gerrit@google.com> 1584609934 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584609934 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: b4197095a3 -s ours am: f82a40ce47 -s ours am: 46b8242ff0 -s ours

am skip reason: subject contains skip directive

Change-Id: I4cc88436a3212664e490be9530ce9e14edc2ac1d