Commit Graph

41589 Commits (a9d47e02c17c951083f33222657e6f67e1974944)

Author SHA1 Message Date
Bill Yi a9d47e02c1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours am: 545560b547 -s ours
am: 5f9a1f096a -s ours
am skip reason: subject contains skip directive

Change-Id: I5c32b1d921da8a9616cc728e41a2f45dac07aaec
2019-10-12 12:41:43 -07:00
Android Build Merger (Role) a8b8b8a541 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12 -s ours am: 0bc3df3750 -s ours am: dc9a31d129 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 19:35:28 +00:00
Bill Yi 5f9a1f096a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours
am: 545560b547 -s ours
am skip reason: subject contains skip directive

Change-Id: I88dc3ae882b713ce134f45044dd51e54dbb78ac2
2019-10-12 12:35:17 -07:00
Bill Yi bfdaa8cea8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12 -s ours am: 0bc3df3750 -s ours
am: f3e110b97e -s ours
am skip reason: subject contains skip directive

Change-Id: I3d96c191bea2f0691bf01cf85c54286ef30e560b
2019-10-12 12:35:17 -07:00
Bill Yi 70464fca0e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12 -s ours am: 0bc3df3750 -s ours
am: dc9a31d129 -s ours
am skip reason: subject contains skip directive

Change-Id: I59e1de1eaa7965ddaaf4a04828d0e64a2865125b
2019-10-12 12:35:16 -07:00
Android Build Merger (Role) f56d0c11c2 Merge "[automerger skipped] Import translations. DO NOT MERGE am: bbac87b20e -s ours am: ef5cf8a8d7 -s ours am: 9af9c775f0 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 19:29:28 +00:00
Bill Yi dc9a31d129 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12 -s ours
am: 0bc3df3750 -s ours
am skip reason: subject contains skip directive

Change-Id: Id46cc6f88bb32c69d80dfc8fc04d78c7887c0f52
2019-10-12 12:29:15 -07:00
Bill Yi 545560b547 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 9223659928 -s ours
am skip reason: subject contains skip directive

Change-Id: I7ad6ef899c277169ac2b338763c21e16043cf943
2019-10-12 12:29:15 -07:00
Bill Yi f3e110b97e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12 -s ours
am: 0bc3df3750 -s ours
am skip reason: subject contains skip directive

Change-Id: If3b99e08ff4355c1cf077f42323549dce256b833
2019-10-12 12:29:15 -07:00
Bill Yi 5d70af8621 [automerger skipped] Import translations. DO NOT MERGE am: bbac87b20e -s ours am: ef5cf8a8d7 -s ours
am: 741bc5f0a5 -s ours
am skip reason: subject contains skip directive

Change-Id: I628a9792e1b4388d86ef6b148be5be6ed338d03c
2019-10-12 12:29:15 -07:00
Bill Yi 03738ff9bc [automerger skipped] Import translations. DO NOT MERGE am: bbac87b20e -s ours am: ef5cf8a8d7 -s ours
am: 9af9c775f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I12d41b6fa2190370b4b70e91c73df7e3541e8147
2019-10-12 12:29:15 -07:00
Bill Yi 0bc3df3750 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 41c7e07d12 -s ours
am skip reason: subject contains skip directive

Change-Id: I0c38b2df9aa5f227b9407a6524a37d11741e46bc
2019-10-12 12:23:24 -07:00
Bill Yi 741bc5f0a5 [automerger skipped] Import translations. DO NOT MERGE am: bbac87b20e -s ours
am: ef5cf8a8d7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib61306fadc2508fc56133b409123c8347f58644d
2019-10-12 12:23:20 -07:00
Bill Yi 9af9c775f0 [automerger skipped] Import translations. DO NOT MERGE am: bbac87b20e -s ours
am: ef5cf8a8d7 -s ours
am skip reason: subject contains skip directive

Change-Id: I216f168b2e7618b32cf053a4f6c813e18ea16ca6
2019-10-12 12:23:20 -07:00
TreeHugger Robot 9223659928 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-10-12 19:19:35 +00:00
Bill Yi ef5cf8a8d7 [automerger skipped] Import translations. DO NOT MERGE
am: bbac87b20e -s ours
am skip reason: subject contains skip directive

Change-Id: I4daeffb2edbeb9afa39a177780f6e5fda6b4814a
2019-10-12 12:17:22 -07:00
TreeHugger Robot 41c7e07d12 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-10-12 19:16:35 +00:00
Android Build Merger (Role) 33ace072b1 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c38c7db007 -s ours am: fc1a356a87 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 18:35:36 +00:00
Bill Yi 51784692b9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c38c7db007 -s ours
am: fc1a356a87 -s ours
am skip reason: subject contains skip directive

Change-Id: Icabf594ddd29089fd665d4b3f339d488f910890f
2019-10-12 11:35:20 -07:00
Bill Yi 76919956c4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c38c7db007 -s ours
am: c993143422 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia860d2b8937f1805c3a51d0dff750ee7ecff4a84
2019-10-12 11:35:19 -07:00
Bill Yi fc1a356a87 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: c38c7db007 -s ours
am skip reason: subject contains skip directive

Change-Id: I6dd2f8f32890aa828ab6aeaec186554d6b9e1977
2019-10-12 11:29:49 -07:00
Bill Yi c993143422 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: c38c7db007 -s ours
am skip reason: subject contains skip directive

Change-Id: I868539d4063dbd3b9d4e014871b5ef0fe42b0325
2019-10-12 11:29:48 -07:00
TreeHugger Robot c38c7db007 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-10-12 18:10:29 +00:00
Android Build Merger (Role) 8f10cad3bb Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ccb540ceda -s ours am: 839ace7e62 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 18:00:32 +00:00
Android Build Merger (Role) 524197d83f Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ccb540ceda -s ours am: 70755c9a4a -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 18:00:23 +00:00
Bill Yi f0325af4d0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ccb540ceda -s ours
am: 839ace7e62 -s ours
am skip reason: subject contains skip directive

Change-Id: I9ad62991e6ca3b42be66c0ac3b1c1bf373ed3d72
2019-10-12 11:00:22 -07:00
Android Build Merger (Role) 6f4a9d32bb Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e801eb78f0 -s ours am: ffe1c80f35 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 18:00:14 +00:00
Bill Yi 21bffeea88 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ccb540ceda -s ours
am: 70755c9a4a -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb67fd39268243f36632997d9ce45a97089861b1
2019-10-12 11:00:14 -07:00
Android Build Merger (Role) dcfb6770e9 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e801eb78f0 -s ours am: e92a1a9c2a -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 18:00:06 +00:00
Bill Yi dd8ccadc88 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e801eb78f0 -s ours
am: ffe1c80f35 -s ours
am skip reason: subject contains skip directive

Change-Id: Id4262ab84a8d297d5234d008a92a031ddffd3735
2019-10-12 11:00:05 -07:00
Android Build Merger (Role) 3be482dffd Merge "[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" into qt-qpr1-dev-plus-aosp 2019-10-12 17:59:57 +00:00
Bill Yi 7b24ec6a1f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e801eb78f0 -s ours
am: e92a1a9c2a -s ours
am skip reason: subject contains skip directive

Change-Id: Iabbb3d37b7c47cd0edfb6a38f447fcb23dd7163a
2019-10-12 10:59:57 -07:00
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 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 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
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
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