Commit graph

41524 commits

Author SHA1 Message Date
Xin Li
aefd756095 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 7c33185b41

Change-Id: I5663f9b3676017b6ed860b7b26328bc4be06e3fa
2019-07-02 13:38:14 -07:00
Xin Li
7c33185b41 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: If86628b9fc81ba5a599ae42e2901066c6bccf173
2019-07-01 21:00:09 +00:00
TreeHugger Robot
2d7a031f4c Merge "Import translations. DO NOT MERGE" 2019-07-01 00:27:32 +00:00
Bill Yi
55141c26c7 Import translations. DO NOT MERGE
Change-Id: I334b253792d204292c3d2ab0e4bee2291fc979d2
Auto-generated-cl: translation import
2019-06-30 09:14:32 -07:00
Bill Yi
6fdd43abb1 Import translations. DO NOT MERGE
Change-Id: I52029df7c39a5af4e6fe76da6edef90d675a6ad2
Auto-generated-cl: translation import
2019-06-30 09:14:18 -07:00
Bill Yi
c19ed2a569 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ac121a2820 -s ours
am: 6e86fcac8a -s ours
am skip reason: subject contains skip directive

Change-Id: Ic3652fac211980b4ed65b2ba02c13449b2c2516b
2019-06-25 22:31:07 -07:00
Bill Yi
6e86fcac8a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: ac121a2820 -s ours
am skip reason: subject contains skip directive

Change-Id: I42accbb5e491294137bc50981ff128f07372c6c4
2019-06-25 22:22:49 -07:00
TreeHugger Robot
ac121a2820 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-26 04:15:33 +00:00
Bill Yi
30dec36ef8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4061ed5736 -s ours am: 751578eb61 -s ours
am: d2688654cb -s ours
am skip reason: subject contains skip directive

Change-Id: I977e654b96f26fd82e4170b9c30956b86647f407
2019-06-25 19:00:22 -07:00
Bill Yi
2dd993e6ba [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4061ed5736 -s ours am: 79209927d7 -s ours
am: 253e96a6ef -s ours
am skip reason: subject contains skip directive

Change-Id: Ia8e28017a1613326698c8ce80da38021332f2945
2019-06-25 18:55:05 -07:00
Bill Yi
d2688654cb [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4061ed5736 -s ours
am: 751578eb61 -s ours
am skip reason: subject contains skip directive

Change-Id: If05fe8e1477e2f0a875daf090155a55ee12e795c
2019-06-25 18:24:44 -07:00
Bill Yi
253e96a6ef [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4061ed5736 -s ours
am: 79209927d7 -s ours
am skip reason: subject contains skip directive

Change-Id: Iee460ee20e3b7883819b86b194d6752957406e17
2019-06-25 18:17:54 -07:00
Bill Yi
751578eb61 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 4061ed5736 -s ours
am skip reason: subject contains skip directive

Change-Id: I32a36bccba7d89c4b87599cf431f335a139256cd
2019-06-25 18:06:49 -07:00
Bill Yi
99cdfc7f9a [automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s ours am: 840c5538d5 -s ours
am: 2a4aba0879 -s ours
am skip reason: subject contains skip directive

Change-Id: Iea8a6a26c95686c4e13daa137d6b9a87723cc0de
2019-06-25 18:06:26 -07:00
Bill Yi
be0ea52ee6 [automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s ours am: f9c445788b -s ours
am: 8563a2027a -s ours
am skip reason: subject contains skip directive

Change-Id: Icad87bed014583309c3a48e88107bd970b0064df
2019-06-25 17:59:41 -07:00
Bill Yi
79209927d7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 4061ed5736 -s ours
am skip reason: subject contains skip directive

Change-Id: I2bc82d808c258bdab168afa691d2a6415e597efb
2019-06-25 17:59:24 -07:00
Bill Yi
2a4aba0879 [automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s ours
am: 840c5538d5 -s ours
am skip reason: subject contains skip directive

Change-Id: I8c144db8e7e390ed19ae1d05280323b974b8fb6d
2019-06-25 17:53:05 -07:00
Bill Yi
8563a2027a [automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s ours
am: f9c445788b -s ours
am skip reason: subject contains skip directive

Change-Id: Ieaa7f260fdab2f969b7bf0807c04126c6bffed95
2019-06-25 17:48:41 -07:00
TreeHugger Robot
4061ed5736 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-26 00:43:59 +00:00
Bill Yi
f9c445788b [automerger skipped] Import translations. DO NOT MERGE
am: 9b767fcba3 -s ours
am skip reason: subject contains skip directive

Change-Id: I3b557b73a894482d524707d8db9522ab3d33aa64
2019-06-25 17:22:03 -07:00
Bill Yi
840c5538d5 [automerger skipped] Import translations. DO NOT MERGE
am: 9b767fcba3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia93571e75a307e18be9afe5898adc1dff1f25df7
2019-06-25 17:20:54 -07:00
Bill Yi
e08f778e3b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Idab5d09722e584c5ffcc5ff574c28bcbbf729aa5
2019-06-25 13:54:19 -07:00
Bill Yi
9b767fcba3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I352b26ea8bf0231df70390d717acd2d1d594b1c5
2019-06-25 13:48:59 -07:00
Bill Yi
f56dd28cc2 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I38b91f6946820fcaa1f28323085f54676ce12615
2019-06-25 13:46:35 -07:00
Bill Yi
febe33b053 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 946037ccaa -s ours
am: df13f0a381 -s ours
am skip reason: subject contains skip directive

Change-Id: I8f637350f8bf23339f983ac162a448907a6dfe41
2019-06-18 22:25:20 -07:00
Bill Yi
e88a55ba6c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 00f42c18e7 -s ours
am: 6aecddb456 -s ours
am skip reason: subject contains skip directive

Change-Id: I6f41923e4119d129afcd05b08bea01d856f124d1
2019-06-18 22:23:02 -07:00
Bill Yi
6913a4ebb9 [automerger skipped] Import translations. DO NOT MERGE am: 3c377f755c -s ours
am: 03ce994eec -s ours
am skip reason: subject contains skip directive

Change-Id: I8f60d02efbb6ef5d8ca867cbffc50c7be7cef61c
2019-06-18 21:27:02 -07:00
Bill Yi
df13f0a381 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 946037ccaa -s ours
am skip reason: subject contains skip directive

Change-Id: Iccfd98779dacb93191083c8cb50b8041899f30db
2019-06-18 20:44:42 -07:00
Bill Yi
6aecddb456 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 00f42c18e7 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a6fe8eb2230651eca9ffb05064320739b424481
2019-06-18 20:41:02 -07:00
Bill Yi
03ce994eec [automerger skipped] Import translations. DO NOT MERGE
am: 3c377f755c -s ours
am skip reason: subject contains skip directive

Change-Id: I0768f2db2bc24836891acc9fa2f00dd2ca0bd873
2019-06-18 20:30:37 -07:00
TreeHugger Robot
946037ccaa Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-19 02:19:26 +00:00
TreeHugger Robot
00f42c18e7 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-19 01:56:54 +00:00
Bill Yi
3c377f755c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I32470cb45f56eb8bdc8f2b2e055e649d34c5e7f3
2019-06-18 15:46:46 -07:00
Bill Yi
0d2eb8b4db Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I2d3706b2fa62b1f3b561db60763e895910b1cbbc
2019-06-18 15:46:01 -07:00
Bill Yi
890f13eb56 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I714e7c7937c2377d86ee7f2a514117d0255f4761
2019-06-18 15:44:18 -07:00
Bill Yi
c29e161403 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 32bb8f9993 -s ours am: 474b6518de -s ours
am: bbce6727cc -s ours
am skip reason: subject contains skip directive

Change-Id: I3cda11ed563d09237eb80db35ddee7ad3a09cdbc
2019-06-18 08:22:12 -07:00
Bill Yi
872d799297 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 32bb8f9993 -s ours am: 0159a56eb0 -s ours
am: 43a72fe360 -s ours
am skip reason: subject contains skip directive

Change-Id: I822bbde9af45981a03808d1c2972aaa04bdc53f5
2019-06-18 08:21:59 -07:00
Bill Yi
05d28c0e0d [automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb -s ours am: 20b7d15ae5 -s ours
am: bfe418d5ef -s ours
am skip reason: subject contains skip directive

Change-Id: Ia68307ad98a2e2b413c785c57b179560b9f6cfe7
2019-06-18 08:21:14 -07:00
Bill Yi
0744bf9b70 [automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb -s ours am: 785f8a21a6 -s ours
am: a6b2800ea9 -s ours
am skip reason: subject contains skip directive

Change-Id: I3300b4794d98269e83469f87b92105b315a0725f
2019-06-18 08:20:17 -07:00
Bill Yi
bbce6727cc [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 32bb8f9993 -s ours
am: 474b6518de -s ours
am skip reason: subject contains skip directive

Change-Id: I5bf6291792086790a4e1179d35db194b737318cf
2019-06-18 08:13:01 -07:00
Android Build Merger (Role)
43a72fe360 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 32bb8f9993 -s ours am: 0159a56eb0 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-06-18 15:12:29 +00:00
Bill Yi
f44e8d06b2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 32bb8f9993 -s ours
am: 0159a56eb0 -s ours
am skip reason: subject contains skip directive

Change-Id: I6b2d10370d7102e02773b267a945d923c390e6a3
2019-06-18 08:12:19 -07:00
Bill Yi
bfe418d5ef [automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb -s ours
am: 20b7d15ae5 -s ours
am skip reason: subject contains skip directive

Change-Id: I712e5cf4b4bfc28115f67148be5de233270676d8
2019-06-18 08:12:11 -07:00
Bill Yi
a6b2800ea9 [automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb -s ours
am: 785f8a21a6 -s ours
am skip reason: subject contains skip directive

Change-Id: Idcf2355955d334ebdb1e7de98540727b195122a9
2019-06-18 08:11:31 -07:00
Bill Yi
0159a56eb0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 32bb8f9993 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd17be5a20f5a1c9787d3f082238c7326ad9b88c
2019-06-18 08:04:21 -07:00
Bill Yi
474b6518de [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 32bb8f9993 -s ours
am skip reason: subject contains skip directive

Change-Id: I7715753ef974b79b2e62c4d14f6ec769284b095c
2019-06-18 08:04:17 -07:00
Bill Yi
20b7d15ae5 [automerger skipped] Import translations. DO NOT MERGE
am: a9ee39f5cb -s ours
am skip reason: subject contains skip directive

Change-Id: I338ac5ff44723d97eda21fc992b2c20499ed84cc
2019-06-18 08:03:29 -07:00
Bill Yi
785f8a21a6 [automerger skipped] Import translations. DO NOT MERGE
am: a9ee39f5cb -s ours
am skip reason: subject contains skip directive

Change-Id: I2da24758f685408817dbe59a3af79c1930c6d19a
2019-06-18 08:03:29 -07:00
TreeHugger Robot
32bb8f9993 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-18 14:43:20 +00:00
Bill Yi
44ff864a95 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I096be536dd6bf947ea5c2d2adb37a905a790027f
2019-06-18 01:07:31 -07:00