commit | e3943cdd296e68f1b28f7774f712f402b107bc5f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jun 24 08:47:24 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 24 08:47:24 2019 -0700 |
tree | 0b78bebe76ee6aa49a4d0a242ae926e93dcee449 | |
parent | 157a81d9051497e45c1943d5ab23d72b01df06c2 [diff] | |
parent | a9cd5d94f3e16bc370cda69a10266f30b8ef11cc [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4ffaa9a225 -s ours am: a9cd5d94f3 -s ours am skip reason: subject contains skip directive Change-Id: I46f8087bac81d03cdbda77b07423d514d5ef109d