commit | b849d40943e51e93e645f6bdd09ea0fda735ece2 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jun 24 08:08:32 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 24 08:08:32 2019 -0700 |
tree | 9882350de2b1f73edcd2a8fa047898892daa0c13 | |
parent | 1077ae03f3e00672df980572fc2c42af502cbf45 [diff] | |
parent | 57e1350c65ee28db2f61ebca7f582b955dcd45cf [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 760558e00a -s ours am: 57e1350c65 -s ours am skip reason: subject contains skip directive Change-Id: If1d2fda472afbf96ea9259f6a9f69969a6b055f4