commit | 6490697a64e5f3ba56cc42b3f765789648a3ab8f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 17 15:36:39 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Apr 17 15:36:39 2019 -0700 |
tree | 472d1dea0df55320f8f4323a67a2be32b00ca5a4 | |
parent | b08d0153527bd661c8149a5595c8c2b3f34e9928 [diff] | |
parent | b22d5f3fe755237c2d636e717f8efd3eb4385a48 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b22d5f3fe7 -s ours am skip reason: subject contains skip directive Change-Id: I43f4b560c39258982bef2f0b4bb178dc8315ef7c