Commit graph

41983 commits

Author SHA1 Message Date
Android Build Merger (Role)
675bf55475 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8d5ac64187 -s ours am: 3e5c5b08bb -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 17:59:48 +00:00
Bill Yi
b2b5f35642 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8d5ac64187 -s ours
am: 3b0a4a9282 -s ours
am skip reason: subject contains skip directive

Change-Id: I6f993cf2c8d3a8a875ac4fb3ceab47bb56ba29ed
2019-10-12 10:59:47 -07:00
Android Build Merger (Role)
37c765eb20 Merge "[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" into qt-qpr1-dev-plus-aosp 2019-10-12 17:59:38 +00:00
Bill Yi
4bf7bb1b8d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8d5ac64187 -s ours
am: 3e5c5b08bb -s ours
am skip reason: subject contains skip directive

Change-Id: Ic1d35dee7e21c56a1b53863b8d9efb3412a2f3a6
2019-10-12 10:59:38 -07:00
Android Build Merger (Role)
fe1d338fa1 Merge "[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" into qt-qpr1-dev-plus-aosp 2019-10-12 17:59:29 +00:00
Bill Yi
286429b34c [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
2019-10-12 10:59:28 -07:00
Bill Yi
248c274b79 [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
2019-10-12 10:59:20 -07:00
Bill Yi
4289710264 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f4ed8f123 -s ours
am: d731040faa -s ours
am skip reason: subject contains skip directive

Change-Id: Ice51201e751b482442fcc4fd598c166fb1c6b968
2019-10-12 10:59:04 -07:00
Bill Yi
f691e6d631 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f4ed8f123 -s ours am: f280b745b6 -s ours
am: 2815bbd81b -s ours
am skip reason: subject contains skip directive

Change-Id: I463b5d169c5a0f55cb10b0e9354d992d3105a406
2019-10-12 10:54:32 -07:00
Bill Yi
839ace7e62 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: ccb540ceda -s ours
am skip reason: subject contains skip directive

Change-Id: I628aa5d7df6bf4d3030fac4d07cd9292ee31706a
2019-10-12 10:54:17 -07:00
Bill Yi
70755c9a4a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: ccb540ceda -s ours
am skip reason: subject contains skip directive

Change-Id: I87084b1a4dc83708060f6e4ed192e25d8ef3a450
2019-10-12 10:54:14 -07:00
Bill Yi
b136ae3ae9 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 0572da0269 -s ours am: e4997095b0 -s ours
am: 24cab7cdc7 -s ours
am skip reason: subject contains skip directive

Change-Id: I5c125bec64b624d0cec95ebf117c8ffaccc2f45a
2019-10-12 10:54:14 -07:00
Bill Yi
ffe1c80f35 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: e801eb78f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I4a4242e21d022e82b969b4d7eb7b2156f4cc82e3
2019-10-12 10:53:53 -07:00
Bill Yi
e92a1a9c2a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: e801eb78f0 -s ours
am skip reason: subject contains skip directive

Change-Id: Iec5326a7073be2ccb79d79ab53f5dfd89ffbfdb8
2019-10-12 10:53:53 -07:00
Bill Yi
851d34ad49 [automerger skipped] Import translations. DO NOT MERGE am: 0572da0269 -s ours am: acf6208137 -s ours
am: 4fc8b1bceb -s ours
am skip reason: subject contains skip directive

Change-Id: I832c75b15fe6faab6fbe0a84b4cdabb6de2f31df
2019-10-12 10:53:52 -07:00
TreeHugger Robot
ccb540ceda Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-10-12 17:49:18 +00:00
Bill Yi
2815bbd81b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f4ed8f123 -s ours
am: f280b745b6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib685d530eba0e8197c31d9091c9b39c67a548e93
2019-10-12 10:48:13 -07:00
Bill Yi
55b938cc76 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a03bec9f92 -s ours
am: 307b384057 -s ours
am skip reason: subject contains skip directive

Change-Id: I5ad434f1a1e28a27e797fbad28d42372cb2c2668
2019-10-12 10:48:11 -07:00
Android Build Merger (Role)
24cab7cdc7 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 0572da0269 -s ours am: e4997095b0 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 17:48:02 +00:00
Bill Yi
3b0a4a9282 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 8d5ac64187 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie081ee0dea24cc13d14a64ac4b2c81af2ccdc8b9
2019-10-12 10:47:55 -07:00
Bill Yi
3e5c5b08bb [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 8d5ac64187 -s ours
am skip reason: subject contains skip directive

Change-Id: I401482cc39014a17de76717dd54065f703ac4a07
2019-10-12 10:47:51 -07:00
Bill Yi
4fc8b1bceb [automerger skipped] Import translations. DO NOT MERGE am: 0572da0269 -s ours
am: acf6208137 -s ours
am skip reason: subject contains skip directive

Change-Id: I7e5b4840c4baddb6e3f28f33160f495ff076af56
2019-10-12 10:47:51 -07:00
Bill Yi
f3fa8789aa [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 60dc13442b -s ours
am: 00a939c043 -s ours
am skip reason: subject contains skip directive

Change-Id: I10a8e802ac611b4610bcc42f3a25581b80c8694d
2019-10-12 10:47:51 -07:00
Bill Yi
28ec15dc67 [automerger skipped] Import translations. DO NOT MERGE am: 0572da0269 -s ours
am: e4997095b0 -s ours
am skip reason: subject contains skip directive

Change-Id: I80bac7ab7a43e9a3ec8bd8a02fe5894ed299ae5e
2019-10-12 10:47:51 -07:00
TreeHugger Robot
e801eb78f0 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-10-12 17:44:27 +00:00
Bill Yi
0db63f2126 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: ea59105148 -s ours
am skip reason: subject contains skip directive

Change-Id: I0bcf3e37a5be8383140bfb2ec6733bd429f50beb
2019-10-12 10:42:01 -07:00
Bill Yi
74cc0f8c3e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: ea59105148 -s ours
am skip reason: subject contains skip directive

Change-Id: I18c2ffd671847f81096cfe88d9b7c9e55f97eaaf
2019-10-12 10:42:00 -07:00
Bill Yi
d731040faa [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 6f4ed8f123 -s ours
am skip reason: subject contains skip directive

Change-Id: I508dad6ceca97a79e226894e410f59b87425ee5f
2019-10-12 10:41:43 -07:00
Bill Yi
307b384057 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: a03bec9f92 -s ours
am skip reason: subject contains skip directive

Change-Id: I061682033e99c9e58f1fcd341880a38f9c37c56f
2019-10-12 10:41:41 -07:00
Bill Yi
f280b745b6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 6f4ed8f123 -s ours
am skip reason: subject contains skip directive

Change-Id: I92cb2ff59c49906807f350a7896bd5bffbb3c9ff
2019-10-12 10:41:40 -07:00
Bill Yi
e5b71422fe [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 458d825272 -s ours
am: ce4a39ddca -s ours
am skip reason: subject contains skip directive

Change-Id: I66a5f72b48978492b90a384b2bc3b179d08595fe
2019-10-12 10:41:40 -07:00
TreeHugger Robot
8d5ac64187 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-10-12 17:41:28 +00:00
Bill Yi
00a939c043 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 60dc13442b -s ours
am skip reason: subject contains skip directive

Change-Id: I0ca61b0f5fcb090967b169b2e6710ef5dafa1b43
2019-10-12 10:41:21 -07:00
Bill Yi
acf6208137 [automerger skipped] Import translations. DO NOT MERGE
am: 0572da0269 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibf525162c7fd61735d7920cd39f70f86d5410469
2019-10-12 10:41:20 -07:00
Bill Yi
e4997095b0 [automerger skipped] Import translations. DO NOT MERGE
am: 0572da0269 -s ours
am skip reason: subject contains skip directive

Change-Id: I050f5d3f28156dd888571a7ed31893897997959e
2019-10-12 10:41:20 -07:00
Bill Yi
b4795def65 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 6486b82908 -s ours
am: 9ee53eb277 -s ours
am skip reason: subject contains skip directive

Change-Id: Iafe93926687b2bf691f3c2ae5d97152bfc2589d4
2019-10-12 10:41:20 -07:00
Bill Yi
5de641c461 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 028cdfdd05 -s ours
am: 65c62dc5e9 -s ours
am skip reason: subject contains skip directive

Change-Id: I1a265d2693914222df1a85cb0bde128efc5099e3
2019-10-12 10:36:56 -07:00
Bill Yi
ce4a39ddca [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 458d825272 -s ours
am skip reason: subject contains skip directive

Change-Id: I0dcd7d3eefa60a97e83e6b0ed1e40d8f4ba7a99a
2019-10-12 10:36:38 -07:00
Bill Yi
3eb2f44036 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 14e8d19136 -s ours
am: 29cd55ff3f -s ours
am skip reason: subject contains skip directive

Change-Id: If9293310e45a19f638b7be59f8083385939dbfe9
2019-10-12 10:36:38 -07:00
Bill Yi
9ee53eb277 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 6486b82908 -s ours
am skip reason: subject contains skip directive

Change-Id: If9bcede23d2c2fcf99b804a2bf812d20af9b6db5
2019-10-12 10:36:20 -07:00
Bill Yi
cfa7f7e559 [automerger skipped] Import translations. DO NOT MERGE am: 36d9a28381 -s ours
am: ab41da5611 -s ours
am skip reason: subject contains skip directive

Change-Id: Iba3d0cff4475800820699ccec1c383a334e2cd52
2019-10-12 10:36:19 -07:00
TreeHugger Robot
a03bec9f92 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-10-12 17:35:36 +00:00
TreeHugger Robot
ea59105148 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-10-12 17:34:27 +00:00
TreeHugger Robot
60dc13442b Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-10-12 17:32:24 +00:00
Bill Yi
65c62dc5e9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 028cdfdd05 -s ours
am skip reason: subject contains skip directive

Change-Id: I392428afd7d2c6dc0d6174afee6bdcd6b688bdcd
2019-10-12 10:31:28 -07:00
Bill Yi
29cd55ff3f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 14e8d19136 -s ours
am skip reason: subject contains skip directive

Change-Id: Id5e5f06d7b2be7890bb09fb4b006c47e7934e7dd
2019-10-12 10:31:10 -07:00
Bill Yi
ab41da5611 [automerger skipped] Import translations. DO NOT MERGE
am: 36d9a28381 -s ours
am skip reason: subject contains skip directive

Change-Id: I6039dd50f2a141423767a918a94f8d112f7e3d6e
2019-10-12 10:30:49 -07:00
TreeHugger Robot
6f4ed8f123 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-10-12 17:28:33 +00:00
TreeHugger Robot
458d825272 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-10-12 17:27:34 +00:00
TreeHugger Robot
6486b82908 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-10-12 17:26:44 +00:00