commit | 4b028ea71d99c30113c307a0bd5522655e166dca | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Sep 03 15:16:40 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Sep 03 15:16:40 2019 -0700 |
tree | 13d47ff352d7e1856dc6051ff0e8d5d4f6dfd5f6 | |
parent | 9ff0bae0ae1ded89396d0a2d4e0d683ae0cf5757 [diff] | |
parent | 36f6254ee36e66cbfda241e5559e0a3155b861f9 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 72babaee36 -s ours am: 36f6254ee3 -s ours am skip reason: subject contains skip directive Change-Id: I5f78a3ffc9c0fb487d547a297379a493405b8618