commit | 29c40ed017ecd536fa365197cce6817aba73aa03 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 04 19:04:15 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 04 19:04:15 2019 -0700 |
tree | c1d7ddd47896f4047d307169973e794f2941b029 | |
parent | a8956caa991a0cf1011f493a10e91820869a778a [diff] | |
parent | adb2e7a4856c8b652f4a79cb2ad775b44611aa32 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6562981448 -s ours am: adb2e7a485 -s ours am skip reason: subject contains skip directive Change-Id: I36b41078a2c26a9968789143df182ed1c57cd30a