commit | 248c274b7962c8ef54fe922256be0a229c8a4bc4 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 10:59:20 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 10:59:20 2019 -0700 |
tree | 3b1b9217cf9d5c3a32a0a3c830ea3f88c15fe73c | |
parent | 2815bbd81b56e0de56cba5187b160df803480866 [diff] | |
parent | 0db63f21261e3c26a3f3a444ee52f4f08a470081 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ea59105148 -s ours am: 0db63f2126 -s ours am skip reason: subject contains skip directive Change-Id: I474bce6062842b252ea588094402953a55450c1b