tree fc2bab5645c9cab799b6b5fce4cf32f7f382996a
parent c90b491a81636eb663e7018753af175419bd5a46
parent f82a40ce4776d80f43790090d0fdbc76bb260749
author TreeHugger Robot <treehugger-gerrit@google.com> 1584608426 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584608426 +0000

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

am skip reason: subject contains skip directive

Change-Id: Id0c6be9883147841940c5106a4d9c04b83714bbd