commit | 0a1ca27859074ef0c69001ec66807c5914b27956 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 11:06:43 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 11:06:43 2019 -0700 |
tree | 971103a8ee9d4c50783f078b72b016c77998c6b2 | |
parent | adb2f0eceecc3092b05c47f9741244f6c3162aab [diff] | |
parent | 3be482dffd52d114557c9fc65187c2078c3f7e4b [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8d5ac64187 -s ours am: 3b0a4a9282 -s ours am: 3be482dffd -s ours am skip reason: subject contains skip directive Change-Id: I268b68ba97b34dca6fdfefc93901ee8cb658500e