commit | febe33b0534f31b53914ab8d67a4ca76f397e0b4 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 18 22:25:20 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 18 22:25:20 2019 -0700 |
tree | 1c807ab7397f845f6f55753eae55f177480ccd7c | |
parent | e88a55ba6cb446155e1d7735c15c6a578ec7a004 [diff] | |
parent | df13f0a381dcc1056b428c49ff6aae7b852cf2ac [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 946037ccaa -s ours am: df13f0a381 -s ours am skip reason: subject contains skip directive Change-Id: I8f637350f8bf23339f983ac162a448907a6dfe41