commit | 955b6fb59e88e3dd65606876d557e2f80d5173d0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 11:08:05 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 11:08:05 2019 -0700 |
tree | 971103a8ee9d4c50783f078b72b016c77998c6b2 | |
parent | cbae281843cb154a0ff744bad6cf54afcabd5725 [diff] | |
parent | 8f10cad3bbb0155f6d3983253ba7febe4b3bfdfe [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ccb540ceda -s ours am: 839ace7e62 -s ours am: 8f10cad3bb -s ours am skip reason: subject contains skip directive Change-Id: I6814d60fcbb4b1f9de82c70131a96229a0f4d524