Commit Graph

42001 Commits (36c1220335eca246104f498205dbcf62915fdecd)

Author SHA1 Message Date
Bill Yi e6a4abfd3c Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e801eb78f0 -s ours am: ffe1c80f35 -s ours
am: 6f4a9d32bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f1b55f13e5501f20bbe7a1f0120b38b4a4bd7c4
2019-10-12 11:07:03 -07:00
Bill Yi 0a1ca27859 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8d5ac64187 -s ours am: 3b0a4a9282 -s ours
am: 3be482dffd -s ours
am skip reason: subject contains skip directive

Change-Id: I268b68ba97b34dca6fdfefc93901ee8cb658500e
2019-10-12 11:06:43 -07:00
Bill Yi adb2f0ecee Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8d5ac64187 -s ours am: 3e5c5b08bb -s ours
am: 675bf55475 -s ours
am skip reason: subject contains skip directive

Change-Id: I1f0b0d97f928be7f2057a6af2f3595ab18050938
2019-10-12 11:06:23 -07:00
Bill Yi 0c6181275b Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ea59105148 -s ours am: 74cc0f8c3e -s ours
am: 37c765eb20 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia4d0103d00f9a03bc202f0a0f61b292d9d83d922
2019-10-12 11:06:01 -07:00
Bill Yi 72b8877c82 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ea59105148 -s ours am: 0db63f2126 -s ours
am: fe1d338fa1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54ae1a6b577b9e1c7b87045cc1382cfa48320fcf
2019-10-12 11:05:25 -07:00
TreeHugger Robot 0b18cfe534 Merge "Import translations. DO NOT MERGE" 2019-10-12 18:04:38 +00:00
TreeHugger Robot 989f71de11 Merge "Import translations. DO NOT MERGE" 2019-10-12 18:03:08 +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 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