commit | a3b0683a1771f01c14fa26ef3da3eef8f666f2e0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 13:26:19 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 13:26:19 2019 -0700 |
tree | 281b488ff00e961dfcf06a6759d146f8f66eaef0 | |
parent | be2e38658a5b977b01f573375cae90d90c5c8568 [diff] | |
parent | bc508606fc106d40e6629cd009b8dfe98a97726b [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours am: 48fd3d016a -s ours am: a68bdf59af -s ours am: bc508606fc -s ours am skip reason: subject contains skip directive Change-Id: Ib702b9e34fde23353055aa9915b9fca8249d6280