commit | 53c35e9b2dc8df2d91da9692e6d757109d3a12dc | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Aug 08 19:03:06 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 08 19:03:06 2019 -0700 |
tree | 6f17c97ad073fa16f4fcca76e3b4c5fa290635bc | |
parent | 608ad1eefdcd8c13f88da6211a5c2c0249c74b08 [diff] | |
parent | 9dce775bd20ade66b9d24776ebaa3031214bb6a3 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 801d177995 -s ours am: da046065c4 -s ours am: 34f88bfe82 -s ours am: 9dce775bd2 -s ours am skip reason: subject contains skip directive Change-Id: I94159f23537687f86ae3d41ba7689e9b09ebd507