commit | ced49257290c18343788f791918b070f8be936e7 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 13 22:38:07 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 13 22:38:07 2019 -0700 |
tree | 5627f2b72d35c45fefba6d64a2417cc9eff66fee | |
parent | 1679a31ea4d9a77286ccbdbf8ccbaf6cf3d50503 [diff] | |
parent | c4cb8af3531a2ae34915ac9fd3fe514320f5677e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 0f3fc4dd54 -s ours am: c4cb8af353 -s ours am skip reason: subject contains skip directive Change-Id: Iee5bd418d59bfa0de8c0a3bd9cfc5cd8976ccc69