commit | ffeda6dcef6d148cd9ee06ae2ea817752f54144e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 17 15:52:14 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Apr 17 15:52:14 2019 -0700 |
tree | 472d1dea0df55320f8f4323a67a2be32b00ca5a4 | |
parent | 2735c8e21e9cc5a1b28df7ea78f704e833f62c86 [diff] | |
parent | 7630c6c5499b3d75e64039f4d3ce44ca69a6fdf2 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7630c6c549 -s ours am skip reason: subject contains skip directive Change-Id: I007c4656a5931249aa353f0b5b54e88189f052e6