commit | 295ed41c6d0214b8ad08ec23b7b30aa37a03c211 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 20 14:05:17 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 20 14:05:17 2019 -0700 |
tree | 87e07763abe642bc95786edbfa6d4ae383464e4c | |
parent | c7885376277aa5152bc651e29b90a8d2a681c264 [diff] | |
parent | 1b1851f8da8d20be60bdfdfd710a7ef978991849 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 1b1851f8da -s ours am skip reason: subject contains skip directive Change-Id: Icb85eb173a3b25046019429b2318836e86ea5b15