tree 43f54d8049a2ede94e0017d632ada745b86950fe
parent 90f37252e0f5e6623f09421f8101fa7bc41ac8e3
parent 6bfacb540c3e2d593e7917a88f6611157696c51a
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1564513169 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1564513169 +0000

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8292b6bb44 -s ours am: b0d1548ece -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp