commit | 4d662f8e762b763ed5799d719ab5399d3fc02fe5 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jul 09 15:18:38 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 09 15:18:38 2019 -0700 |
tree | 06d283e6a354f0ae6f938744b27e0a58b90a3d68 | |
parent | 5ea18e824abce039ba56818ff0197be149a65b69 [diff] | |
parent | f97d15933f7ef0d09fc3faf4f95a54ea7b947101 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: a5121a4fa9 -s ours am: f97d15933f -s ours am skip reason: subject contains skip directive Change-Id: I2d08d4d24d9324c4555069f70114b5946036ec72