tree 0d589f942ded5ca734691ba2939a3716457c8859
parent 61786a0c677134f337ef136f112f78787a059da2
parent b9ccf26280b2bc1b19bb65bfd0fceae219f29667
author TreeHugger Robot <treehugger-gerrit@google.com> 1584611528 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584611528 +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: dca9655145 -s ours am: b9ccf26280 -s ours

am skip reason: subject contains skip directive

Change-Id: I4c20ec96c2370119bb5dfb205cadfc39fd2011ce