Commit graph

41910 commits

Author SHA1 Message Date
Bill Yi
2a33dbf0fa [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours
am: 62880febef -s ours
am skip reason: subject contains skip directive

Change-Id: I022a0f63e2f73f42acba9ef1976eda5223bb0972
2019-10-12 12:54:52 -07:00
Bill Yi
101d12062e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours
am: 62880febef -s ours
am skip reason: subject contains skip directive

Change-Id: I854f9600e4806cb82cd4a324836e88e05e258cf9
2019-10-12 12:54:52 -07:00
Bill Yi
08d02150b8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours
am: 7c609c0cc4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie402c6a14b1c86ad2ba41d0af728aa4fb31c55cf
2019-10-12 12:54:33 -07:00
Bill Yi
fb2d095a03 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours
am: 7c609c0cc4 -s ours
am skip reason: subject contains skip directive

Change-Id: I836b594b3870dfdac403f7b7194e0af5045f2d30
2019-10-12 12:54:33 -07:00
TreeHugger Robot
7604e64ecc Merge "Import translations. DO NOT MERGE" into qt-dev 2019-10-12 19:54:25 +00:00
Bill Yi
1f0792dfc2 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours am: fde82958ce -s ours
am: 0b32d74e30 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib66b021546a71cc2abec26f8674b6b2935512bc9
2019-10-12 12:49:04 -07:00
Bill Yi
b3169ab23b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours am: 8095dc0335 -s ours
am: f5eab04303 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic1dcf850cbb3ef8b2f5e0323acb41911f49ff83b
2019-10-12 12:48:43 -07:00
Bill Yi
5ede8c526a Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours am: 545560b547 -s ours am: bea0b23926 -s ours
am: 9a4bc0c15f -s ours
am skip reason: subject contains skip directive

Change-Id: I0a92bb590453f8e1fced99a69701c0e2cca1bde1
2019-10-12 12:48:25 -07:00
Bill Yi
62880febef [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 6b7a42ebf2 -s ours
am skip reason: subject contains skip directive

Change-Id: I2c38e94cb07c35d148e7dfaca94b6a7e5ec4d09d
2019-10-12 12:48:24 -07:00
Bill Yi
7c609c0cc4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: abff0ad0e3 -s ours
am skip reason: subject contains skip directive

Change-Id: I82d7a41da78f4ee69f786cfa7a7681ea21438af1
2019-10-12 12:48:01 -07:00
Bill Yi
ed55f25bf9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours am: 545560b547 -s ours am: 5f9a1f096a -s ours
am: a9d47e02c1 -s ours
am skip reason: subject contains skip directive

Change-Id: I708bb1bbb61a638db4df643d3b574be1cbd6180b
2019-10-12 12:48:01 -07:00
Android Build Merger (Role)
0b32d74e30 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours am: fde82958ce -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 19:42:13 +00:00
Bill Yi
7704960b61 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: a8b8b8a541 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb2e8e5af533e26893219e214f940f65ec994784
2019-10-12 12:42:04 -07:00
Bill Yi
01e4ed3f3b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours
am: fde82958ce -s ours
am skip reason: subject contains skip directive

Change-Id: Icf0547daa5197fec922282a7765d73d0a5012ea7
2019-10-12 12:42:04 -07:00
Bill Yi
f5eab04303 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours
am: 8095dc0335 -s ours
am skip reason: subject contains skip directive

Change-Id: I434fbb316d2a10f3b68045de8500fed5625b53db
2019-10-12 12:42:02 -07:00
Android Build Merger (Role)
9a4bc0c15f Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours am: 545560b547 -s ours am: bea0b23926 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 19:41:54 +00:00
Bill Yi
abdc401375 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12 -s ours am: 0bc3df3750 -s ours am: f3e110b97e -s ours
am: bfdaa8cea8 -s ours
am skip reason: subject contains skip directive

Change-Id: I7e9d72a39ee43926a07ba116601735da09a9a225
2019-10-12 12:41:44 -07:00
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
Bill Yi
46deb644e0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours am: 545560b547 -s ours
am: bea0b23926 -s ours
am skip reason: subject contains skip directive

Change-Id: I477764102ed76b9d802ba410a68245e823acc188
2019-10-12 12:41:43 -07:00
TreeHugger Robot
6b7a42ebf2 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-10-12 19:39:54 +00:00
TreeHugger Robot
abff0ad0e3 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-10-12 19:37:34 +00:00
Bill Yi
fde82958ce [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours
am: c70c3a3236 -s ours
am skip reason: subject contains skip directive

Change-Id: I419c288f9379307fb0ecd6bd8c8a72ecb254b53b
2019-10-12 12:35:36 -07:00
Bill Yi
411c330b8d Merge "[automerger skipped] Import translations. DO NOT MERGE am: bbac87b20e -s ours am: ef5cf8a8d7 -s ours am: 9af9c775f0 -s ours
am: f56d0c11c2 -s ours
am skip reason: subject contains skip directive

Change-Id: Ida94bc87135eaaa4a3d74b1873b52b107ae7fdfc
2019-10-12 12:35:36 -07:00
Bill Yi
8095dc0335 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours
am: c70c3a3236 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie9e6eda811ead3e547ba9c299dd790a3d5fb5aba
2019-10-12 12:35:35 -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
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
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
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