commit | 55d4ff752635f27de9334eeec77b71a9142578e0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun May 12 09:44:56 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun May 12 09:44:56 2019 -0700 |
tree | 59b7dcebf2ba8acc16f911fc7d4cd1805d108f86 | |
parent | 7ba49c8643127cfc6933d60a7ac9c990accda16b [diff] | |
parent | 162fea1eb87fc7e3a59d4dc0a97dd7a9c18ad4a2 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2a12d1e621 -s ours am: 162fea1eb8 -s ours am skip reason: subject contains skip directive Change-Id: I55172f5b0f9e0ec8870665a286f64b3893daba51