commit | 30dec36ef8294fdb9e1e797bfc270f0e2dd7132d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 25 19:00:22 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 25 19:00:22 2019 -0700 |
tree | 1c807ab7397f845f6f55753eae55f177480ccd7c | |
parent | 2dd993e6ba2d192a7385772eff1a9b962984a6d5 [diff] | |
parent | d2688654cb1b7c3a90096ad4296032fce23d0e90 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4061ed5736 -s ours am: 751578eb61 -s ours am: d2688654cb -s ours am skip reason: subject contains skip directive Change-Id: I977e654b96f26fd82e4170b9c30956b86647f407