commit | cbae281843cb154a0ff744bad6cf54afcabd5725 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 11:07:44 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 11:07:44 2019 -0700 |
tree | 971103a8ee9d4c50783f078b72b016c77998c6b2 | |
parent | e6a4abfd3c0f4162806f2eaa1bdb5fec18f84551 [diff] | |
parent | 524197d83f5cc1272309e818f6eb26777c869c70 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ccb540ceda -s ours am: 70755c9a4a -s ours am: 524197d83f -s ours am skip reason: subject contains skip directive Change-Id: I6f3dbb2af2b8ab313f7a3365fc7e24461214bde3