tree deb206a7efa6231977dad27724f53ceb613b63bc
parent df742ba4ec31e677781a838bcc9ffbdd528cfc86
parent 07faa31a1c2daaa5edc64c8fde66195969a11b0d
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1563487442 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1563487442 +0000

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