commit | 171a77af76cb3047650b027eba7f15f6fe068c6f | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed May 22 11:22:44 2019 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 22 11:22:44 2019 +0000 |
tree | 888705539fad0bd555aa00982269ff417b0019d2 | |
parent | 02499d318763256ef401cca5d2b808aafd2569cf [diff] | |
parent | 0dcfdba30dd4b1bcb2827fd234cc77d3dd4f4b62 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 91d2a1cc28 -s ours am: bdce4d4bd9 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp