commit | f292afc14f14c3f1176d2e075bd10b7bcc3750ba | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jun 24 09:11:57 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 24 09:11:57 2019 -0700 |
tree | 327813f3031b344a0b2c9348147e04e45434625e | |
parent | 9c74836d2ec389808b6f501deb3636b288d2ff7f [diff] | |
parent | c9f3d2d6fef7da5a19799205f6bd79f8d878b7af [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7e5f2498f9 -s ours am: c9f3d2d6fe -s ours am skip reason: subject contains skip directive Change-Id: I7b2acbe3d46cddaf7840bc9167bd5836c3296864