commit | 256f03bc2b2eb2ca2a66a7a80c21cc72bd718aa9 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Apr 18 09:23:06 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 18 09:23:06 2019 -0700 |
tree | 78ba677dcf9733c9f85d6d40ccf09a3a908c547a | |
parent | 91783cb10e6b09dda93876147b8be13498948c25 [diff] | |
parent | ccf4768a5d85cb83fc03d412931107e86a7d4722 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7a476607bd -s ours am: ccf4768a5d -s ours am skip reason: subject contains skip directive Change-Id: Ic3558179014a9fb5fd18cb4f05408a7ce5082bfd