commit | 64bbc44fe348d3ddde3887d48bb682e89cd1dd01 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed May 22 20:46:48 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 22 20:46:48 2019 -0700 |
tree | 91fc2ff7eb23ebb65455ad1bda51105c1afe2661 | |
parent | a19c355c6171ea093d55f9d5c38555ebec70a3f6 [diff] | |
parent | c9e7c9603c20838a00511bf25f57ca3d0ca25243 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e2529357e8 -s ours am: fa3da95195 -s ours am: c9e7c9603c -s ours am skip reason: subject contains skip directive Change-Id: I8e35329f84fabff4af7590f9896aeb4110fd2067