tree 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9
parent 52f88dbd7140eb715f904aba79d7108e22e915c3
parent dd89dd54b16bf5e9a00778e86b4cc188697ce520
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594046070 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1594046070 +0000

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0f192f44d7 -s ours am: b30a1434b9 -s ours am: 9b4bf2cbba -s ours am: 4c526e22cf -s ours" into rvc-qpr-dev-plus-aosp