commit | 62dcf1d39164f2bdb38f4b6a1d13ba6f6811accb | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 13:25:40 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 13:25:40 2019 -0700 |
tree | 281b488ff00e961dfcf06a6759d146f8f66eaef0 | |
parent | 1031bd58fa859a1bf4cbffcdb5141fa9aeaccd8a [diff] | |
parent | 06a6bf5ecca650965cd0643de973e295b59539c1 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours am: 62880febef -s ours am: 2a33dbf0fa -s ours am: 06a6bf5ecc -s ours am skip reason: subject contains skip directive Change-Id: Id975ffda749e3e9483447cd7b81ce97cc75c82ed