tree cafc663e8de1188d088e618bd101bbf8752b2ef5
parent d6947882d769478e1e2dfec4230938c3dbcc6283
parent 2564a62c1ab171194868eb6e2613ef311d2a5719
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1565083553 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1565083553 +0000

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab6ef4f0df -s ours am: 3633c30ccd -s ours am: 884b0ce1ec -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp