commit | 7aaea006edd1159bb74affb893761d16b539d8fa | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jul 30 11:58:18 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 30 11:58:18 2019 -0700 |
tree | 8dfc6a78c356debfe3bc60265b58610fa1d8ebd2 | |
parent | 307f77889b000e180a500a89aee8d485e09aca33 [diff] | |
parent | e4d497bd6bfe0b09a28ea48d008aed497f93f975 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: eaadb371c5 -s ours am: e4d497bd6b -s ours am skip reason: subject contains skip directive Change-Id: I02094b8054d61592ac9bb5372581c44ab69fdee2