commit | 5c632565abdb65c243c91a5d6edb2159865ada3a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Aug 12 11:30:24 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 12 11:30:24 2019 -0700 |
tree | b546820b04251a6e8c9a5009502485768289a2d9 | |
parent | 0246081ed1299cfd70bec539a862b02acc9500bf [diff] | |
parent | 0cc9bed12c0cd2761250aac549ce722065006aed [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 0cc9bed12c -s ours am skip reason: subject contains skip directive Change-Id: I23a40558abb57cee36601e59a538d0e80e6ef0d1