tree 3e14afb1d468151582d6d1ea720d5692762ab893
parent f0a5036d03c4a983a18a224746da9cf4115fc13f
parent b4197095a3495b9bbe09d1913d8821d8ca93af1f
author TreeHugger Robot <treehugger-gerrit@google.com> 1584607702 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584607702 +0000

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

am skip reason: subject contains skip directive

Change-Id: If8032c8f9c299759a50020c1e2bc4bf2e4843dac