Xin Li
229f77abff
[automerger skipped] Merge Coral/Flame into AOSP master am: edd21ffb49
-s ours
...
am: 2b7ba7e4af
-s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f
is in history
Change-Id: I7fa7159bb18295b7de072d4769118df186e8b2e8
2019-10-26 22:37:35 -07:00
Xin Li
2b7ba7e4af
[automerger skipped] Merge Coral/Flame into AOSP master
...
am: edd21ffb49
-s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f
is in history
Change-Id: I50ae1a452471407dd779e039f192d4ec95c12a1c
2019-10-26 22:21:11 -07:00
Xin Li
edd21ffb49
Merge Coral/Flame into AOSP master
...
Bug: 141248619
Change-Id: I66aa50b606f3284d1a431f50cd6cae7574aab4a5
Merged-In: I4af5f825051fb85e4c6d58f310d9209036c63ea8
2019-10-25 10:28:07 -07:00
Xin Li
0de2363a6f
Skip QD1A.190821.011 in stage-aosp-master
...
am: c8782e216f
Change-Id: I4b98af1ff11fbc56e4fe2c5511f4db341ad28b07
2019-10-23 15:22:01 -07:00
Xin Li
c8782e216f
Skip QD1A.190821.011 in stage-aosp-master
...
Bug: 141248619
Change-Id: I4af5f825051fb85e4c6d58f310d9209036c63ea8
2019-10-16 15:19:27 -07:00
Bill Yi
a68bdf59af
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc
-s ours
...
am: 48fd3d016a
-s ours
am skip reason: subject contains skip directive
Change-Id: I787484f47dcbf7227ffce7a7d7d3f39acbd01001
2019-10-12 13:13:49 -07:00
Bill Yi
48fd3d016a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 7604e64ecc
-s ours
am skip reason: subject contains skip directive
Change-Id: Iaf05b347b2b5d48857c449a4eecba8d917aa54da
2019-10-12 13:07:48 -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
TreeHugger Robot
7604e64ecc
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-10-12 19:54:25 +00: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
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
8d5ac64187
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-10-12 17:41:28 +00: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
TreeHugger Robot
ea59105148
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-10-12 17:34:27 +00:00
TreeHugger Robot
6f4ed8f123
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-10-12 17:28:33 +00:00
Bill Yi
716cf9bd8a
Import translations. DO NOT MERGE
...
Change-Id: Ib628adda1816a2f5a326b5af8d62b62eb5ca220b
Auto-generated-cl: translation import
2019-10-12 07:29:50 -07:00
Bill Yi
cdd45d8dd4
Import translations. DO NOT MERGE
...
Change-Id: Ie021836a7928ad9781e17c50b3686f8c3849f74d
Auto-generated-cl: translation import
2019-10-12 07:28:52 -07:00
Bill Yi
0572da0269
Import translations. DO NOT MERGE
...
Change-Id: Ic2f680a72dc473a3ea9e63ba2781519c0bb0d189
Auto-generated-cl: translation import
2019-10-12 07:23:38 -07:00
Bill Yi
bbac87b20e
Import translations. DO NOT MERGE
...
Change-Id: I4da730ecd128512ddd2abaf5ece66c70d781f186
Auto-generated-cl: translation import
2019-10-12 07:22:48 -07:00
Bill Yi
0616cbb635
Import translations. DO NOT MERGE
...
Change-Id: I52324e9458f9b928e2827ea70097b0eb93054467
Auto-generated-cl: translation import
2019-10-12 07:12:49 -07:00
Bill Yi
39c8fbc099
Import translations. DO NOT MERGE
...
Change-Id: I7c4d06039b54997e53849f3bb0d895b6cdf590e9
Auto-generated-cl: translation import
2019-10-12 07:11:56 -07:00
Bill Yi
f606642ad8
Import translations. DO NOT MERGE
...
Change-Id: I82edee0a0dea7496bade7e58f2e1cef8d450a81c
Auto-generated-cl: translation import
2019-10-12 07:02:24 -07:00
Bill Yi
13f8b064f9
Import translations. DO NOT MERGE
...
Change-Id: I9b4f6fb732d42e8ccd233c7b0fea8459b63a3155
Auto-generated-cl: translation import
2019-10-12 07:00:30 -07:00
Bill Yi
91f63a735e
Import translations. DO NOT MERGE
...
Change-Id: I9b10a94aff23f6ea9158bc5a62ac044c99002777
Auto-generated-cl: translation import
2019-10-12 06:54:21 -07:00
Bill Yi
f89836690c
Import translations. DO NOT MERGE
...
Change-Id: I800104c1ced927253792a4a9c8f07237e244dced
Auto-generated-cl: translation import
2019-10-12 06:53:33 -07:00
Bill Yi
f62c25fa05
Import translations. DO NOT MERGE
...
Change-Id: Ic07661110f439c1e0ee62a0876670d369b6e556d
Auto-generated-cl: translation import
2019-10-12 06:48:47 -07:00
Bill Yi
81b73d7943
Import translations. DO NOT MERGE
...
Change-Id: If7bdcd0382dc225a464522d39a112dad4853dc24
Auto-generated-cl: translation import
2019-10-12 06:48:01 -07:00