commit | bd154e9399b06e1c50ac4f782c0263944540e4a1 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat May 25 13:29:18 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat May 25 13:29:18 2019 -0700 |
tree | c1d7ddd47896f4047d307169973e794f2941b029 | |
parent | 15872a68666db7a58888edc077a4f9b2fe8f86dc [diff] | |
parent | da256d6977dc151e9b8d1c10b8da5890ec22367e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0d6a3d5e45 -s ours am: da256d6977 -s ours am skip reason: subject contains skip directive Change-Id: I40a06b408128805145bb3e15a201f7b0a7520351