commit | 86dd002952474514e82361a72b5c9ed0e037374d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 07 12:23:43 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 07 12:23:43 2019 -0700 |
tree | 291f741a90ec48b33a3da30208bcd955e49554dd | |
parent | 3be42de7a858e53638d7374a9e77b54f00769e2c [diff] | |
parent | a1d096a7f05eed973b16690097eca9e44b893ec8 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d07bcd4b0d -s ours am: a1d096a7f0 -s ours am skip reason: subject contains skip directive Change-Id: I7dc1e7113f4719f1a7e47fe0af69de10f7237de3