commit | 2c240886c0835dd6244804f5dfc64ccc871b4f31 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Jun 30 17:51:11 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Jun 30 17:51:11 2019 -0700 |
tree | 43ab5e36d99055ebb8fa0d159a925cf4e14f9d4a | |
parent | 26aba21b435be548bede5cb729d8bdb1c25238da [diff] | |
parent | e876855f599c8fc11a9f1371e3ae1c01d32d794a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e876855f59 -s ours am skip reason: subject contains skip directive Change-Id: I7ae0a6ae0964926b73289bcf54425da88fbd7a80