Bill Yi
4e7b6ed0e5
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 13cb0a15ca
-s ours am: ae2e00e1d0
-s ours am: 7dcbfbd0d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I0b4f93cae42f4ffd0c1c08bc879303c6156682ff
2021-09-20 13:59:26 +00:00
Bill Yi
3fd3850821
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: 2cf7817de7
-s ours am: 78507d697d
-s ours am: 65992373b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I0a223de47ad513cbb4f07620f225f71af9669fb8
2021-09-20 13:59:10 +00:00
Bill Yi
e0616317af
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp am: 6bff29a287
am: 24dabad62e
am: aa7a1362e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Id64d3549e7646c34f137e8758da6e521f5ba6daf
2021-09-20 13:58:46 +00:00
Bill Yi
a7add5dbee
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 6c50635319
-s ours am: 39f5c07a46
-s ours am: 10f66958a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ied165641ab5f45947e98a8a1315c95dc02732752
2021-09-20 13:58:45 +00:00
Bill Yi
43ca32d28f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 15c729b335
-s ours am: 7159a65e51
-s ours am: a8bb61fd6a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I83756328848ffdbb41df14ea28a1b58e2fb63dc3
2021-09-20 13:58:03 +00:00
Bill Yi
c19d9c96c5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: bd4c0ff5eb
-s ours am: 9440aa4378
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ifadc29d28b1b4c6a55fc5f9695a074e35549f6de
2021-09-20 13:43:34 +00:00
Bill Yi
82ff199ad6
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f
am: 82e2ee2a19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ie96faf70255322f537b8f270a444d5a4cf1e14fd
2021-09-20 13:43:29 +00:00
Bill Yi
1b62d44530
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 8e9c812e54
-s ours am: 2dda71d5a4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I091335e2e231f1f3f24fdc93aba7e5e7344e7515
2021-09-20 13:43:28 +00:00
Automerger Merge Worker
c0e89c29e6
Merge changes from topic "am-f6977f162413434b9b6d152bf7a8ae79" into sc-v2-dev-plus-aosp
...
* changes:
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84
am: 488e676e07
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 13cb0a15ca
-s ours am: b50c2b8618
-s ours
2021-09-20 13:43:24 +00:00
Bill Yi
9953aadfa5
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84
am: 488e676e07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I0705a1dfef63722cff672849b45c8c8daa2db666
2021-09-20 13:43:21 +00:00
Bill Yi
3352a113f0
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 13cb0a15ca
-s ours am: b50c2b8618
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: Ida15bc27882efb4c81cad953cceb8cb7ba3b7180
2021-09-20 13:43:19 +00:00
Bill Yi
7e6599c614
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: bd4c0ff5eb
-s ours am: 801bcbf545
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ifc13ed6a3f0ee6a9853394dd8e9b7407c34762f0
2021-09-20 13:43:18 +00:00
Bill Yi
c07efa7cfa
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f
am: 523f18b4eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ifb94c6620dc35fe6a94d3df361ba13c7ded63346
2021-09-20 13:43:12 +00:00
Bill Yi
561b78152e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 8e9c812e54
-s ours am: dfbbc071c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I1ec7a5191ad513bfba68a14cc929de4d4a518616
2021-09-20 13:43:11 +00:00
Bill Yi
2e67fd2b8d
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84
am: 5f9d29ac41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I94a33ea0836cd8d8767ce12535bb8d55cf0403fe
2021-09-20 13:43:05 +00:00
Bill Yi
7dcbfbd0d9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 13cb0a15ca
-s ours am: ae2e00e1d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: Ida492582a2d3265ab453094ff4aafd6843b19dca
2021-09-20 13:43:04 +00:00
Bill Yi
65992373b7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: 2cf7817de7
-s ours am: 78507d697d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Icfee5270bc38a5372ec171486ea9189163515d70
2021-09-20 13:42:58 +00:00
Bill Yi
aa7a1362e2
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp am: 6bff29a287
am: 24dabad62e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I30d247182b1fbfbee142eef5e5f80ccfa41099cb
2021-09-20 13:42:53 +00:00
Bill Yi
10f66958a3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 6c50635319
-s ours am: 39f5c07a46
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Iecad8a37cb6eaaa1f1cb996f300c48eb106be272
2021-09-20 13:42:52 +00:00
Bill Yi
a8bb61fd6a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 15c729b335
-s ours am: 7159a65e51
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I08ff54fe6b23a7de05276260eb921c4943be56e7
2021-09-20 13:42:34 +00:00
Bill Yi
9440aa4378
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: bd4c0ff5eb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Iae681d3e4c03751edaa64d18d0307837069a0fd2
2021-09-20 13:29:41 +00:00
Bill Yi
82e2ee2a19
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I971b708ead65b7280781fda0ef2fe4c3f059fbd4
2021-09-20 13:29:36 +00:00
Bill Yi
2dda71d5a4
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 8e9c812e54
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I7a5a0c940fb48171d1b4a0f0e27b637e6ba94846
2021-09-20 13:29:35 +00:00
Bill Yi
801bcbf545
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: bd4c0ff5eb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ie13bee53a99e19f0221392508abbc0ecb74423fb
2021-09-20 13:29:30 +00:00
Bill Yi
523f18b4eb
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I1a29f9d44a44210065a8c259de323c41602b4caf
2021-09-20 13:29:25 +00:00
Bill Yi
dfbbc071c2
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 8e9c812e54
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I7668f86291ca4ccc18baee56141016cd5fe6d126
2021-09-20 13:29:24 +00:00
Bill Yi
488e676e07
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: Ibca51c31152956772bd7f2d312e7d8158d0af9b6
2021-09-20 13:29:19 +00:00
Bill Yi
b50c2b8618
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 13cb0a15ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I90481230c65ee912ab5bd67ba1b4228288ef69ac
2021-09-20 13:29:18 +00:00
Bill Yi
5f9d29ac41
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I0d7994d278d45ea2d17791b4824a46e062cb0751
2021-09-20 13:29:08 +00:00
Bill Yi
ae2e00e1d0
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 13cb0a15ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I067a00a8909307ae3f52c431d4d9507d286882d1
2021-09-20 13:29:05 +00:00
Bill Yi
bd4c0ff5eb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ibc7043058da7c8a68c4605ada978fa58fe7b8171
2021-09-20 13:29:01 +00:00
Bill Yi
78507d697d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: 2cf7817de7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I4848bbfd71eb759d93bb59620ccb0fc719d97f67
2021-09-20 13:28:52 +00:00
Bill Yi
24dabad62e
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp am: 6bff29a287
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ic3ded16601c92a03262dd117d7e6eed2d002eecb
2021-09-20 13:28:48 +00:00
Bill Yi
39f5c07a46
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 6c50635319
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Iddace0681dfb896a08d5f4180f79371d4b5ceaaf
2021-09-20 13:28:47 +00:00
Bill Yi
7159a65e51
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 15c729b335
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I49a5b608f3c33a6aa74a95d39bcf674cafbfc6c7
2021-09-20 13:28:37 +00:00
Bill Yi
271538063b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: 7ae69a606a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I023652d879e127ac50a50c006f59c244e34ea02a
2021-09-20 13:28:32 +00:00
Bill Yi
fce069bc7d
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-mainline-prod am: dc217a8213
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I2daeffe1ff82dde50ff92065d3fceb5b0fffe84b
2021-09-20 13:28:27 +00:00
Bill Yi
0af9eabf24
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8d5d3dc1af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860611
Change-Id: Ia27698d997bb7b023c1243de969cb20071f12bab
2021-09-20 13:28:17 +00:00
Bill Yi
394718aad0
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-mainline-prod am: 60b7cbbd6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I3ec654d5243aacf855222ed724702e73aa288ff3
2021-09-20 13:28:10 +00:00
Bill Yi
7ae69a606a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Iba79df6ba63d3474996c68b78e8786f2b4b3274f
2021-09-20 13:28:03 +00:00
Bill Yi
2cf7817de7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I89cb67f37af3095da61f90fe665e6814bd592dfe
2021-09-20 13:27:54 +00:00
Bill Yi
66375d4530
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-09-20 13:13:42 +00:00
Bill Yi
a24dbc064f
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:42 +00:00
Bill Yi
6bff29a287
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:42 +00:00
Bill Yi
dc217a8213
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:42 +00:00
Bill Yi
a9b7463e6d
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
2p: a0633f5acf
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:42 +00:00
Bill Yi
8d5d3dc1af
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-09-20 13:13:04 +00:00
Bill Yi
cf8ea19226
Merge changes from topic "presubmit-am-4767d054095942768d54a95ec7cc02ab"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d06e16aba1
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:04 +00:00
Bill Yi
fb733b7d84
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:12:43 +00:00
Bill Yi
60b7cbbd6b
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:12:43 +00:00