commit | 286429b34cf96640cb8b5ec8e73ea408b40384a0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 10:59:28 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 10:59:28 2019 -0700 |
tree | 3b1b9217cf9d5c3a32a0a3c830ea3f88c15fe73c | |
parent | 4289710264acccac7936cbb3931508eaeb4cd1e4 [diff] | |
parent | 74cc0f8c3e16c364f40935a855cce416c4342703 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ea59105148 -s ours am: 74cc0f8c3e -s ours am skip reason: subject contains skip directive Change-Id: I0250acb21cfc060f4ac19b0206e50e5ef26adde1