Commit graph

41417 commits

Author SHA1 Message Date
Bill Yi
d7911332cc [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6562981448 -s ours am: 786dd43b9e -s ours
am: 882969d4f5 -s ours
am skip reason: subject contains skip directive

Change-Id: I9909ae6aea36ee803c04f2fa13309df630691ba3
2019-06-04 20:31:29 -07:00
Bill Yi
7fd4a6a54e [automerger skipped] Import translations. DO NOT MERGE am: fef85b3c7b -s ours am: 29f347eef3 -s ours
am: e1b0efcdc5 -s ours
am skip reason: subject contains skip directive

Change-Id: I08d5825e1bf759fe9ef6a01d4448cbfab1fc1163
2019-06-04 20:28:07 -07:00
Bill Yi
7304476a81 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6562981448 -s ours am: adb2e7a485 -s ours
am: 29c40ed017 -s ours
am skip reason: subject contains skip directive

Change-Id: Iebdb8efc6f53ebae4d355105e6aba949c0b7572e
2019-06-04 20:23:50 -07:00
Bill Yi
70eff69243 [automerger skipped] Import translations. DO NOT MERGE am: fef85b3c7b -s ours am: abc504f98b -s ours
am: a8956caa99 -s ours
am skip reason: subject contains skip directive

Change-Id: I0a5445868966fa8f68ab36fa078cdbe29e1961db
2019-06-04 20:10:40 -07:00
Bill Yi
882969d4f5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6562981448 -s ours
am: 786dd43b9e -s ours
am skip reason: subject contains skip directive

Change-Id: If9d9679862a20f662574f2480fe3fb0668f106a4
2019-06-04 19:12:56 -07:00
Bill Yi
e1b0efcdc5 [automerger skipped] Import translations. DO NOT MERGE am: fef85b3c7b -s ours
am: 29f347eef3 -s ours
am skip reason: subject contains skip directive

Change-Id: I21b976b20b3c65f753f5ff2694c413bd7764eba9
2019-06-04 19:08:23 -07:00
Bill Yi
29c40ed017 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6562981448 -s ours
am: adb2e7a485 -s ours
am skip reason: subject contains skip directive

Change-Id: I36b41078a2c26a9968789143df182ed1c57cd30a
2019-06-04 19:04:15 -07:00
Bill Yi
a8956caa99 [automerger skipped] Import translations. DO NOT MERGE am: fef85b3c7b -s ours
am: abc504f98b -s ours
am skip reason: subject contains skip directive

Change-Id: Ied7cd172a0c100fbefd113a5cb78f31346f50d4c
2019-06-04 19:00:26 -07:00
Bill Yi
786dd43b9e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 6562981448 -s ours
am skip reason: subject contains skip directive

Change-Id: Id88e74f86f38baf9132d4b64723e710b261e6906
2019-06-04 18:26:38 -07:00
Bill Yi
29f347eef3 [automerger skipped] Import translations. DO NOT MERGE
am: fef85b3c7b -s ours
am skip reason: subject contains skip directive

Change-Id: I1ce5a4c80d46736758d5502359de508d1253daa6
2019-06-04 18:16:46 -07:00
Bill Yi
adb2e7a485 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 6562981448 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib17c23265e511bd7d81bea27ead2731cce5c6c81
2019-06-04 18:09:47 -07:00
Bill Yi
abc504f98b [automerger skipped] Import translations. DO NOT MERGE
am: fef85b3c7b -s ours
am skip reason: subject contains skip directive

Change-Id: I0a9653dd8ccbd77ee0d5cb05aca79d89b20f629c
2019-06-04 18:01:35 -07:00
TreeHugger Robot
6562981448 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-04 23:03:36 +00:00
Bill Yi
fef85b3c7b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8cc15dd237c6e8313d997b37829b7924e2bb9c6a
2019-06-04 10:27:11 -07:00
Bill Yi
31a7793e28 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I5de46104c83a4d2efc933d473ec29e19c18684c4
2019-06-04 10:24:31 -07:00
Bill Yi
329485655e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0d6a3d5e45 -s ours am: da256d6977 -s ours
am: bd154e9399 -s ours
am skip reason: subject contains skip directive

Change-Id: I13b8df5f5dbe206fe65c80c3337aa5da3ead6d97
2019-05-25 13:34:22 -07:00
Bill Yi
3b984c0806 [automerger skipped] Import translations. DO NOT MERGE am: b9e9ce91af -s ours am: 77ce29cdba -s ours
am: 15872a6866 -s ours
am skip reason: subject contains skip directive

Change-Id: I822be1dd08adc65cf93e4bfe061dfa6eea429c6a
2019-05-25 13:31:42 -07:00
Bill Yi
02b47b66cb [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0d6a3d5e45 -s ours am: 187fbe0b78 -s ours
am: 0a5410d82b -s ours
am skip reason: subject contains skip directive

Change-Id: I56e3ad43252fa4bcad8f01a2b43597008aee47ff
2019-05-25 13:31:25 -07:00
Bill Yi
27e4b504da [automerger skipped] Import translations. DO NOT MERGE am: b9e9ce91af -s ours am: cfcf95bd16 -s ours
am: 9cb9d223ea -s ours
am skip reason: subject contains skip directive

Change-Id: Icfe77a9d9fdab4d667f5611615ab3557d9cb32b7
2019-05-25 13:30:57 -07:00
Bill Yi
bd154e9399 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0d6a3d5e45 -s ours
am: da256d6977 -s ours
am skip reason: subject contains skip directive

Change-Id: I40a06b408128805145bb3e15a201f7b0a7520351
2019-05-25 13:29:18 -07:00
Bill Yi
15872a6866 [automerger skipped] Import translations. DO NOT MERGE am: b9e9ce91af -s ours
am: 77ce29cdba -s ours
am skip reason: subject contains skip directive

Change-Id: I68f8dd78e7dd52ecf989178a90068b1a52278263
2019-05-25 13:28:44 -07:00
Bill Yi
0a5410d82b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0d6a3d5e45 -s ours
am: 187fbe0b78 -s ours
am skip reason: subject contains skip directive

Change-Id: I457059e186ce2593db3df0451a003db2013ab3b9
2019-05-25 13:27:46 -07:00
Bill Yi
9cb9d223ea [automerger skipped] Import translations. DO NOT MERGE am: b9e9ce91af -s ours
am: cfcf95bd16 -s ours
am skip reason: subject contains skip directive

Change-Id: I5cbc6cef012c6ff1f651b1a968c3a5a2b8e7ace3
2019-05-25 13:27:08 -07:00
Bill Yi
da256d6977 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 0d6a3d5e45 -s ours
am skip reason: subject contains skip directive

Change-Id: I9e82c8b059209bf0a732330a55a53a7066629591
2019-05-25 13:23:16 -07:00
Bill Yi
77ce29cdba [automerger skipped] Import translations. DO NOT MERGE
am: b9e9ce91af -s ours
am skip reason: subject contains skip directive

Change-Id: Ie0c8884ff9ac362621cc70f6cc266096cbe0f25e
2019-05-25 13:22:40 -07:00
Bill Yi
187fbe0b78 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 0d6a3d5e45 -s ours
am skip reason: subject contains skip directive

Change-Id: I03bbddaced7e70dc51f32aad95b8b52318d454a3
2019-05-25 13:20:44 -07:00
Bill Yi
cfcf95bd16 [automerger skipped] Import translations. DO NOT MERGE
am: b9e9ce91af -s ours
am skip reason: subject contains skip directive

Change-Id: Ie4c5f6f7a3ea5b028a895aa483833574470760ba
2019-05-25 13:20:05 -07:00
TreeHugger Robot
0d6a3d5e45 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-05-25 20:07:51 +00:00
Bill Yi
b9e9ce91af Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I70c1aad8f2ad45a20eb55fee33619a3f4e319939
2019-05-25 04:30:24 -07:00
Bill Yi
36cad42156 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I27597dd25043d3dd0b14a7e3a359a2b15f35164d
2019-05-25 04:28:20 -07:00
Xin Li
e364f4046d [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: cec8e18f43 -s ours am: e4c638b347 -s ours am: 45850f87d3
am: 3664117e54 -s ours
am skip reason: subject contains skip directive

Change-Id: I588c050bc9e965f4fb0ec6edc5bb765f57a20cb1
2019-05-17 13:52:44 -07:00
Xin Li
2f8f08e2c2 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: d37d8eb393 -s ours am: c480d6b171 -s ours am: 731104e942
am: d26d1e4341 -s ours
am skip reason: subject contains skip directive

Change-Id: I94e527c0df09d2f49fdf4ed124e18427a5583e93
2019-05-17 12:12:19 -07:00
Xin Li
3664117e54 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: cec8e18f43 -s ours am: e4c638b347 -s ours
am: 45850f87d3

Change-Id: Ic44a5b9a1f0f3a17cd6db3f1e7c0800b4e060718
2019-05-16 23:51:28 -07:00
Xin Li
d26d1e4341 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: d37d8eb393 -s ours am: c480d6b171 -s ours
am: 731104e942

Change-Id: Ia3fbd73ad2b30b22ccc843360be12ab16d77bf37
2019-05-16 23:00:26 -07:00
Xin Li
45850f87d3 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: cec8e18f43 -s ours
am: e4c638b347 -s ours
am skip reason: subject contains skip directive

Change-Id: I666228f850628ebccc47fa1202e2c346264045d2
2019-05-16 21:53:41 -07:00
Xin Li
731104e942 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: d37d8eb393 -s ours
am: c480d6b171 -s ours
am skip reason: subject contains skip directive

Change-Id: I2f1f32251a2e1d882fbb14f0190c46cc65d75c4a
2019-05-16 21:27:12 -07:00
Xin Li
e4c638b347 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."
am: cec8e18f43 -s ours
am skip reason: subject contains skip directive

Change-Id: Iea1345ae20d8f2ff40dc612e402fa6982762d964
2019-05-16 20:52:06 -07:00
Xin Li
c480d6b171 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
am: d37d8eb393 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibac4638899787d2a9b4baa504b6f6dbaf8937a67
2019-05-16 19:23:55 -07:00
Xin Li
cec8e18f43 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." 2019-05-17 00:58:08 +00:00
Xin Li
30945b6ca6 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: a9e018f52d -s ours am: 7c6bb3d242
am: 4ab5b60c89 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic3f5920166d9421fde12377789c4ef2600bda620
2019-05-16 10:30:30 -07:00
Xin Li
4ab5b60c89 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: a9e018f52d -s ours
am: 7c6bb3d242

Change-Id: I57ce9f40bc405e3c7324e8697573752b2a9169f4
2019-05-16 02:49:47 -07:00
Xin Li
7c6bb3d242 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
am: a9e018f52d -s ours
am skip reason: subject contains skip directive

Change-Id: I9bfc1d01a6ce738e15c30cc50f7cb1739b6b58bc
2019-05-15 17:40:27 -07:00
Xin Li
d37d8eb393 DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
Bug: 132622481
Change-Id: I9521ad8c3f1b9df8328e8ef32c4e5ff2033eed74
2019-05-15 16:55:40 -07:00
Xin Li
a9e018f52d DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: I64de94291e8fb8ac0e0b574594c3923aeb97d21d
2019-05-13 15:39:17 -07:00
Bill Yi
da490f06b8 Import translations. DO NOT MERGE
Change-Id: I7ec1c2054a3670d38f2631020421a0c6c574de25
Auto-generated-cl: translation import
2019-05-10 23:49:43 -07:00
Xin Li
76e38ba2cf [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: c4da57fd0b -s ours am: 01aeedb800 -s ours
am: 5d44bd7dc4 -s ours
am skip reason: subject contains skip directive

Change-Id: I8ec99fb6c3f88a1cdbca9c424662d76e556e8c2e
2019-05-10 01:41:03 -07:00
Xin Li
5d44bd7dc4 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: c4da57fd0b -s ours
am: 01aeedb800 -s ours
am skip reason: subject contains skip directive

Change-Id: I8452805a7121ee1a991a5199e61942ccf08abd05
2019-05-09 21:50:17 -07:00
Xin Li
be7af0610d [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: b4be6d6430 -s ours am: 9461d4e8c5 -s ours
am: 45d851378d -s ours
am skip reason: subject contains skip directive

Change-Id: Ice048cdc7d0fa23761e86f61f698f20066968a18
2019-05-09 21:36:38 -07:00
Xin Li
01aeedb800 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: c4da57fd0b -s ours
am skip reason: subject contains skip directive

Change-Id: Ia13b45ecdcdf64cdbec21ca24508144026cc8401
2019-05-09 19:14:39 -07:00
Xin Li
45d851378d [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: b4be6d6430 -s ours
am: 9461d4e8c5 -s ours
am skip reason: subject contains skip directive

Change-Id: I39f1ddfb3062220724a8d527aeadc6fcab49b882
2019-05-09 17:26:36 -07:00