commit | 7ceea6ceaf3a6d88a89f96fc330e9411a99478a5 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jun 24 09:13:36 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 24 09:13:36 2019 -0700 |
tree | 327813f3031b344a0b2c9348147e04e45434625e | |
parent | e69b008cf24a80b91421213ee36029a2c428ff34 [diff] | |
parent | 157a81d9051497e45c1943d5ab23d72b01df06c2 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: cc13f9ed66 -s ours am: 49a60e6b40 -s ours am: 157a81d905 -s ours am skip reason: subject contains skip directive Change-Id: If786fcdfa4959e72aa288ecc7abef1d05e238749