commit | 025db3d33ecf08153391559f75eb0fc0263446ec | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 11 03:16:27 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 11 03:16:27 2019 -0700 |
tree | 1d47a5d2ac26c05c6bef24d379e1148bd02341b5 | |
parent | c2b71969450c67ee99ecc4e32bc2a897ef20d45b [diff] | |
parent | 1da3bf10bf319d2fcf0f3c262361fc59cd5bd64c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours am: 1da3bf10bf -s ours am skip reason: subject contains skip directive Change-Id: I1550a0d712b5b8853292e5f05ffda2b4d4a90bff