commit | 712ffbb92de5806a0ed51e4d641b84e392186694 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jun 24 09:15:29 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 24 09:15:29 2019 -0700 |
tree | 327813f3031b344a0b2c9348147e04e45434625e | |
parent | 56b397e6b8e70b9b0311bf54096c6cb94e86b052 [diff] | |
parent | 18c98d52b6e12191e80ecd806a44159f72b7818d [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4ffaa9a225 -s ours am: a9cd5d94f3 -s ours am: 18c98d52b6 -s ours am skip reason: subject contains skip directive Change-Id: I5ee9acf1a7af97b3d8400cd6b9cc6eed3d1065c6