commit | 872d799297ad162b308557bc713a5531eb878336 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 18 08:21:59 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 18 08:21:59 2019 -0700 |
tree | 1c807ab7397f845f6f55753eae55f177480ccd7c | |
parent | 05d28c0e0d58898df21adc8378c1e926ea670337 [diff] | |
parent | 43a72fe36020baecc9b904cfdf3dc287cb5a6f6b [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 32bb8f9993 -s ours am: 0159a56eb0 -s ours am: 43a72fe360 -s ours am skip reason: subject contains skip directive Change-Id: I822bbde9af45981a03808d1c2972aaa04bdc53f5