Commit Graph

41983 Commits (7f3bcefd9fb12e745383799af86c2eae68e11f4c)

Author SHA1 Message Date
Bill Yi bea0b23926 [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: Idc3719dff7c48d853ca8e1918d69bebbb7ebe2c5
2019-10-12 12:35:16 -07:00
Bill Yi 657c012305 [automerger skipped] Import translations. DO NOT MERGE am: bbac87b20e -s ours am: ef5cf8a8d7 -s ours am: 741bc5f0a5 -s ours
am: 5d70af8621 -s ours
am skip reason: subject contains skip directive

Change-Id: Id4cd68fe57affca3342680ec2716c610ac45bb73
2019-10-12 12:35:16 -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
Bill Yi c70c3a3236 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: e9fa91113e -s ours
am skip reason: subject contains skip directive

Change-Id: I230864ffc1832bf287f2771f84dcee9bfbcebd41
2019-10-12 12:29:33 -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 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 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 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 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
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
TreeHugger Robot e9fa91113e Merge "Import translations. DO NOT MERGE" into qt-dev 2019-10-12 19:21:35 +00: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
TreeHugger Robot d3c51db948 Merge "Import translations. DO NOT MERGE" 2019-10-12 19:11:24 +00:00
TreeHugger Robot f080039f36 Merge "Import translations. DO NOT MERGE" 2019-10-12 18:47:41 +00:00
Bill Yi 001f4d19c4 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c38c7db007 -s ours am: fc1a356a87 -s ours
am: 33ace072b1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee6f17d87d5ef031339198961002f22d4371920c
2019-10-12 11:40:50 -07: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
TreeHugger Robot bcad66fa53 Merge "Import translations. DO NOT MERGE" 2019-10-12 18:33:01 +00: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 4d4586f743 Merge "Import translations. DO NOT MERGE" 2019-10-12 18:17:28 +00:00
TreeHugger Robot c38c7db007 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-10-12 18:10:29 +00:00
TreeHugger Robot e5046427ab Merge "Import translations. DO NOT MERGE" 2019-10-12 18:09:38 +00:00
Bill Yi 955b6fb59e Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ccb540ceda -s ours am: 839ace7e62 -s ours
am: 8f10cad3bb -s ours
am skip reason: subject contains skip directive

Change-Id: I6814d60fcbb4b1f9de82c70131a96229a0f4d524
2019-10-12 11:08:05 -07:00
Bill Yi cbae281843 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ccb540ceda -s ours am: 70755c9a4a -s ours
am: 524197d83f -s ours
am skip reason: subject contains skip directive

Change-Id: I6f3dbb2af2b8ab313f7a3365fc7e24461214bde3
2019-10-12 11:07:44 -07:00
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