tree 4fa175bca51060fed5d927837b9a70351e276eec
parent 8a47a20328f3a9a687bad09c87d3cc1d21c8b50d
parent e0badeade139fb9c32aab24fb9ed4da8c853ea95
author TreeHugger Robot <treehugger-gerrit@google.com> 1584549736 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584549736 +0000

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

am skip reason: subject contains skip directive

Change-Id: I080493d068de8c63daf5037a7b8cbd1db1fdc47c