commit | 60534a8d17d5b8ad5608f2d96e2183be278f2768 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jun 24 08:46:29 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 24 08:46:29 2019 -0700 |
tree | 0b78bebe76ee6aa49a4d0a242ae926e93dcee449 | |
parent | c9f3d2d6fef7da5a19799205f6bd79f8d878b7af [diff] | |
parent | d1809212c44a402875de254fd86368c53b3b037e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c000487154 -s ours am: d1809212c4 -s ours am skip reason: subject contains skip directive Change-Id: Ibdbcf6f0094782d13c57be50582b6671cd41dfa4