commit | cea1870b3330f85df79910a0d04050e17c3ee79b | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Aug 09 13:21:34 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Aug 09 13:21:34 2019 -0700 |
tree | 611357840efa164aabd1e50e75413a9767a868b5 | |
parent | c805741b760bccd609b27dd8aeacf52383016791 [diff] | |
parent | f92250ba895f1d82e0ad8a36e60245d6d3090194 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421fab -s ours am: 32cc5ed314 -s ours am: fa110bea9b -s ours am: f92250ba89 -s ours am skip reason: subject contains skip directive Change-Id: Iffa16dea135edb7ce7b763571b6abf676eba58f5