commit | 999a254183d1f6081b200b9e46cd32dbee493615 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Apr 06 23:43:33 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Apr 06 23:43:33 2019 -0700 |
tree | 472d1dea0df55320f8f4323a67a2be32b00ca5a4 | |
parent | 20a525269872746281e9a1ac2cfc50c5c9286d0d [diff] | |
parent | 3be975240efe7fa084c0e591684bd2b41d0a6f71 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9db1319d77 -s ours am: 3be975240e -s ours am skip reason: subject contains skip directive Change-Id: Ife6a0d363fb4753f04285bbe3553f14b9a19c378