Bill Yi
b36c49ba12
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5d962cfa05
-s ours
...
am: 1eced9d815
-s ours
am skip reason: subject contains skip directive
Change-Id: If559a1a08bdd5f38f42439d265a67dea756a6aa1
2019-09-28 17:07:23 -07:00
Bill Yi
cb3431d30d
[automerger skipped] Import translations. DO NOT MERGE am: 200379da8c
-s ours
...
am: 71894b3a31
-s ours
am skip reason: subject contains skip directive
Change-Id: I1fd2a86dfc3c0f5eadc83e994bde32c83479ef0e
2019-09-28 14:24:04 -07:00
Bill Yi
1eced9d815
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: 5d962cfa05
-s ours
am skip reason: subject contains skip directive
Change-Id: I3b2e75974e58d5822c248ecb18ff7f0fbfc98178
2019-09-28 14:23:19 -07:00
Bill Yi
71894b3a31
[automerger skipped] Import translations. DO NOT MERGE
...
am: 200379da8c
-s ours
am skip reason: subject contains skip directive
Change-Id: I95e0fb646ebf8cde720b69e76aa3ca3ac7122236
2019-09-28 14:17:17 -07:00
TreeHugger Robot
5d962cfa05
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-09-28 21:08:35 +00:00
Bill Yi
200379da8c
Import translations. DO NOT MERGE
...
Change-Id: I3cefde7ca4a9a8cc2545425cf55ffbe682d23c00
Auto-generated-cl: translation import
2019-09-28 08:22:17 -07:00
Bill Yi
3cdb1c85ec
Import translations. DO NOT MERGE
...
Change-Id: Idcedda568c413544da952613c556345175ba4d9d
Auto-generated-cl: translation import
2019-09-28 08:19:50 -07:00
Bill Yi
6dff86fc94
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a40932ee2
-s ours am: 1735eebfc9
-s ours
...
am: d7a7742162
-s ours
am skip reason: subject contains skip directive
Change-Id: I84e525f285d8ee5f31aa862d528704e9531ecc05
2019-09-25 08:12:46 -07:00
Bill Yi
6075ab475b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9cee1b60eb
-s ours am: becdaa61d3
-s ours
...
am: a73b48e122
-s ours
am skip reason: subject contains skip directive
Change-Id: I959cf7032a348cd6a8b8ad95a39c8f3e1a9094b4
2019-09-25 08:06:26 -07:00
Bill Yi
3d02fb5346
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 54bcf4c593
-s ours am: 9e4d808cb0
-s ours
...
am: 3b7bc98ba9
-s ours
am skip reason: subject contains skip directive
Change-Id: I41a8ca47ca5b9a472e97817a6c811a49c588656e
2019-09-25 08:05:52 -07:00
Bill Yi
2afc14c15b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6e683f824a
-s ours am: 776972a813
-s ours
...
am: 66180b47d5
-s ours
am skip reason: subject contains skip directive
Change-Id: I926c59d971d257564b59a5255e42c1976afa295e
2019-09-25 08:05:03 -07:00
Bill Yi
ce4a63346d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 355dfa6850
-s ours am: 071424bf41
-s ours
...
am: 22cf5296bf
-s ours
am skip reason: subject contains skip directive
Change-Id: I3285dcf94f875aac3ce6bbf8b11da4c183c6a9a0
2019-09-25 08:04:31 -07:00
Bill Yi
d7a7742162
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a40932ee2
-s ours
...
am: 1735eebfc9
-s ours
am skip reason: subject contains skip directive
Change-Id: I55e11d97aa07d4605cd3fb0539b3e7d59f0cd04b
2019-09-25 08:02:38 -07:00
Bill Yi
be3da284fa
[automerger skipped] Import translations. DO NOT MERGE am: d7efca3250
-s ours am: 071ff1cef4
-s ours
...
am: ad205aa3d2
-s ours
am skip reason: subject contains skip directive
Change-Id: I98614d02fd53483d62b9c21a4a4756bb1ee6198e
2019-09-25 08:00:49 -07:00
Bill Yi
a73b48e122
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9cee1b60eb
-s ours
...
am: becdaa61d3
-s ours
am skip reason: subject contains skip directive
Change-Id: I6541c3829eca1e96b48200a07503e012448b48cb
2019-09-25 07:52:22 -07:00
Bill Yi
3b7bc98ba9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 54bcf4c593
-s ours
...
am: 9e4d808cb0
-s ours
am skip reason: subject contains skip directive
Change-Id: If9f78a52ff0695750ea33b1581056a2aba9782a8
2019-09-25 07:51:17 -07:00
Bill Yi
66180b47d5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6e683f824a
-s ours
...
am: 776972a813
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia9a8e8d97c266077fdd505f630d2195fcaa7939e
2019-09-25 07:50:39 -07:00
Bill Yi
22cf5296bf
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 355dfa6850
-s ours
...
am: 071424bf41
-s ours
am skip reason: subject contains skip directive
Change-Id: I54645bcf37dab935ac61377b5a2d2ca4252412d9
2019-09-25 07:50:07 -07:00
Bill Yi
ad205aa3d2
[automerger skipped] Import translations. DO NOT MERGE am: d7efca3250
-s ours
...
am: 071ff1cef4
-s ours
am skip reason: subject contains skip directive
Change-Id: I85ea1158105b7fa517bb90beadc0afc542a7d296
2019-09-25 07:47:40 -07:00
Bill Yi
1735eebfc9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 6a40932ee2
-s ours
am skip reason: subject contains skip directive
Change-Id: I2f54cfa03da54267965fbaf6647f14d5d49cd8f4
2019-09-25 07:40:33 -07:00
Bill Yi
becdaa61d3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 9cee1b60eb
-s ours
am skip reason: subject contains skip directive
Change-Id: I1ae16b36de94b61ac7a5bb060392597931094a72
2019-09-25 07:36:25 -07:00
Bill Yi
9e4d808cb0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 54bcf4c593
-s ours
am skip reason: subject contains skip directive
Change-Id: I9d322853f778eed82196a2418605f1f1ebc74244
2019-09-25 07:35:55 -07:00
Bill Yi
776972a813
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 6e683f824a
-s ours
am skip reason: subject contains skip directive
Change-Id: Iab6a8618ec303432c48fff2cafd5eb37069513fb
2019-09-25 07:35:30 -07:00
Bill Yi
071424bf41
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 355dfa6850
-s ours
am skip reason: subject contains skip directive
Change-Id: Iafcb9add900447734297a8c79db3d55b48fd2584
2019-09-25 07:34:54 -07:00
Bill Yi
071ff1cef4
[automerger skipped] Import translations. DO NOT MERGE
...
am: d7efca3250
-s ours
am skip reason: subject contains skip directive
Change-Id: If860200f7e59fc1c29d45f5bb0c2848cff3fe4fd
2019-09-25 07:32:21 -07:00
TreeHugger Robot
6a40932ee2
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2019-09-25 14:18:45 +00:00
TreeHugger Robot
9cee1b60eb
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2019-09-25 14:11:15 +00:00
TreeHugger Robot
54bcf4c593
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2019-09-25 14:11:13 +00:00
TreeHugger Robot
6e683f824a
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2019-09-25 14:07:40 +00:00
TreeHugger Robot
355dfa6850
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2019-09-25 13:58:13 +00:00
Bill Yi
71c0e9adab
Import translations. DO NOT MERGE
...
Change-Id: Ib5d118c530a2f1a8a7671dcd5e5c3b77526b2582
Auto-generated-cl: translation import
2019-09-24 22:10:45 -07:00
Bill Yi
d7efca3250
Import translations. DO NOT MERGE
...
Change-Id: Ic8c8b74c22d74c43897762200e7b0c925ce1e5c0
Auto-generated-cl: translation import
2019-09-24 22:10:05 -07:00
Bill Yi
5ac7c60248
Import translations. DO NOT MERGE
...
Change-Id: I35067db3dbae5228b51d48383eae67eba48a6717
Auto-generated-cl: translation import
2019-09-24 22:09:07 -07:00
Bill Yi
0cdbc7b3b9
Import translations. DO NOT MERGE
...
Change-Id: I8735b7149146b06e4f2df15c746c24ca83b97b94
Auto-generated-cl: translation import
2019-09-24 22:08:29 -07:00
Bill Yi
3f805692b0
Import translations. DO NOT MERGE
...
Change-Id: I25500c09630cd8037896424a30086207d489467b
Auto-generated-cl: translation import
2019-09-24 22:07:17 -07:00
Bill Yi
1cad92ede4
Import translations. DO NOT MERGE
...
Change-Id: I15b1a2d1ad1b939ef39ef2484f779668c54a1bf8
Auto-generated-cl: translation import
2019-09-24 22:06:40 -07:00
TreeHugger Robot
b7b8ce6c9b
Merge "Import translations. DO NOT MERGE"
2019-09-22 20:06:36 +00:00
Bill Yi
5fe4d13897
Import translations. DO NOT MERGE
...
Change-Id: I57b997f66c345b0c0514e9c3c7ed7991ea6fc483
Auto-generated-cl: translation import
2019-09-22 03:15:20 -07:00
Bill Yi
02f3f105e1
Import translations. DO NOT MERGE
...
Change-Id: I65c22d7115304aa452b9d292d6f51967e4f89abe
Auto-generated-cl: translation import
2019-09-22 03:15:05 -07:00
Bill Yi
da31791a80
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a47de0ea53
-s ours
...
am: b2d2dff9b6
-s ours
am skip reason: subject contains skip directive
Change-Id: I5812e0f0dfe6196c8e1a1141ad055d46d9838918
2019-09-15 15:21:48 -07:00
Bill Yi
a9f486020a
[automerger skipped] Import translations. DO NOT MERGE am: 6d4054689c
-s ours
...
am: 1855c48f02
-s ours
am skip reason: subject contains skip directive
Change-Id: I58aecceb97e56ffecb5b2f6453602c654ec09b9e
2019-09-15 15:21:30 -07:00
Bill Yi
b2d2dff9b6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: a47de0ea53
-s ours
am skip reason: subject contains skip directive
Change-Id: I2aefc157ff64e0e3b62d16909e0cf56ef1408b42
2019-09-15 15:15:46 -07:00
Bill Yi
1855c48f02
[automerger skipped] Import translations. DO NOT MERGE
...
am: 6d4054689c
-s ours
am skip reason: subject contains skip directive
Change-Id: I2a5e86721b5dd2b14421bb4c4490a94402ca5d75
2019-09-15 15:15:27 -07:00
TreeHugger Robot
a47de0ea53
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-09-15 22:06:33 +00:00
Bill Yi
6d4054689c
Import translations. DO NOT MERGE
...
Change-Id: I4e461ef0ca123067d2e5dfe83bbf2e574c316aaf
Auto-generated-cl: translation import
2019-09-14 13:51:21 -07:00
Bill Yi
926f9a639f
Import translations. DO NOT MERGE
...
Change-Id: Ia6e012e9fc72e368d328f70a573229c9a19601b6
Auto-generated-cl: translation import
2019-09-14 13:49:08 -07:00
lumark
4d18504a40
[automerger skipped] Merge "Create display context when switching IME to new display for AOSP IME" am: 9ab8c21cb8
am: a70b532462
am: 2c8b0d9a2e
...
am: cd50381752
-s ours
am skip reason: change_id I0ed6a079af1ed90c75fee1d36d5ce3ef3c41f8ed with SHA1 4d464ec07d
is in history
Change-Id: I1da3fc025e61f5b461ec62f730c060b882adb336
2019-09-11 11:38:13 -07:00
Xin Li
68cffd687b
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 309cb0811a
-s ours am: dc59e8ef85
-s ours
...
am: 7a2ab62102
-s ours
am skip reason: change_id I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16 with SHA1 66fb808791
is in history
Change-Id: If6b2ef482de51474ce11e2f67d07eb24071b3860
2019-09-11 11:13:26 -07:00
lumark
cd50381752
Merge "Create display context when switching IME to new display for AOSP IME" am: 9ab8c21cb8
am: a70b532462
...
am: 2c8b0d9a2e
Change-Id: Ibd031067e7dbc4fd327185f9040d0ab337ac5923
2019-09-10 19:40:32 -07:00
lumark
2c8b0d9a2e
Merge "Create display context when switching IME to new display for AOSP IME" am: 9ab8c21cb8
...
am: a70b532462
Change-Id: Ie9dc641bd908758d30ae9f0e83182ee4f6036c19
2019-09-10 19:33:31 -07:00