commit | 6db6f37674ff722cb8158b9b9af545556b745ab8 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Aug 08 18:54:22 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 08 18:54:22 2019 -0700 |
tree | 44a010bb1c83c46fb55199bf5e79c363e0c22874 | |
parent | 9dce775bd20ade66b9d24776ebaa3031214bb6a3 [diff] | |
parent | 585f5f228cbc31c46b44cb30b844632de1c269da [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 801d177995 -s ours am: b87c62f388 -s ours am: 585f5f228c -s ours am skip reason: subject contains skip directive Change-Id: I29e7815de2fa52015832f519048b4b13e63036aa