PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,553 Commits 1 Branch 0 Tags
65b45b6ecb97fb9a49b5beca6dc737840c60e9ca
Commit Graph

106553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
459290e613 [automerger skipped] Validate config activities with their rule owners am: 65b18b5e69 am: cc3edfd2c7 -s ours am: 8fada38f9e -s ours am: 8355374ddb -s ours am: 8badd7a6a4 -s ours am: 86249fda47 -s ours am: df212577c6 -s ours 
am skip reason: skipped by user yurilin

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215

Change-Id: I240549f8dcf6631d0aba1f4d066e587f9bfaa283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 01:01:25 +00:00
Julia Reynolds
43738f40fc [automerger skipped] Validate config activities with their rule owners am: 65b18b5e69 am: cc3edfd2c7 -s ours am: 8fada38f9e -s ours am: 8355374ddb -s ours am: 8badd7a6a4 -s ours am: 7cb32cee36 -s ours 
am skip reason: skipped by user yurilin

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215

Change-Id: Ib41bb9e855d6aa34190505510ff70e3bbf743ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 00:57:39 +00:00
Julia Reynolds
df212577c6 [automerger skipped] Validate config activities with their rule owners am: 65b18b5e69 am: cc3edfd2c7 -s ours am: 8fada38f9e -s ours am: 8355374ddb -s ours am: 8badd7a6a4 -s ours am: 86249fda47 -s ours 
am skip reason: skipped by user yurilin

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215

Change-Id: Ib3483803cb08ab67a6345c9bfd8b76ff84f91387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 00:56:19 +00:00
Julia Reynolds
7cb32cee36 [automerger skipped] Validate config activities with their rule owners am: 65b18b5e69 am: cc3edfd2c7 -s ours am: 8fada38f9e -s ours am: 8355374ddb -s ours am: 8badd7a6a4 -s ours 
am skip reason: skipped by user yurilin

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215

Change-Id: I00ddbb23e1ba526fb53716fa3a31cb40fd22bab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 00:33:43 +00:00
Julia Reynolds
86249fda47 [automerger skipped] Validate config activities with their rule owners am: 65b18b5e69 am: cc3edfd2c7 -s ours am: 8fada38f9e -s ours am: 8355374ddb -s ours am: 8badd7a6a4 -s ours 
am skip reason: skipped by user yurilin

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215

Change-Id: I39a3cdb66df8cf98dfaea4421bbbdd581b1f4d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 00:32:46 +00:00
Julia Reynolds
8badd7a6a4 [automerger skipped] Validate config activities with their rule owners am: 65b18b5e69 am: cc3edfd2c7 -s ours am: 8fada38f9e -s ours am: 8355374ddb -s ours 
am skip reason: skipped by user yurilin

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215

Change-Id: Ic38c5cbf072f80ce3fe323dde9c960e36659f847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:34:12 +00:00
Julia Reynolds
a69297fe5b [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 541f64ddfb -s ours am: 25a49730f4 -s ours am: e1725f466c -s ours am: 0a1cd64ee5 -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: Ic400bedc658d7c80ba51eb9010d91cddddfdb55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:04:16 +00:00
Julia Reynolds
3fba7a5a07 [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 541f64ddfb -s ours am: 25a49730f4 -s ours am: e1725f466c -s ours am: ba416fd53a -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: I68ccf9fffc3473f9d110145fb6021da1cbbf4d65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:03:42 +00:00
Julia Reynolds
8355374ddb [automerger skipped] Validate config activities with their rule owners am: 65b18b5e69 am: cc3edfd2c7 -s ours am: 8fada38f9e -s ours 
am skip reason: skipped by user yurilin

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215

Change-Id: Ief88df7619d8fa00cdf9a9c7a64bdb422bdeab47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:01:01 +00:00
Julia Reynolds
ba416fd53a [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 541f64ddfb -s ours am: 25a49730f4 -s ours am: e1725f466c -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: I4b4086d881d714eb14d86214c38054474901c83e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:55:44 +00:00
Julia Reynolds
0a1cd64ee5 [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 541f64ddfb -s ours am: 25a49730f4 -s ours am: e1725f466c -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: I3e46fb64af71d5536e7f7689d6c31c87335954c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:55:25 +00:00
Julia Reynolds
8fada38f9e [automerger skipped] Validate config activities with their rule owners am: 65b18b5e69 am: cc3edfd2c7 -s ours 
am skip reason: skipped by user yurilin

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215

Change-Id: Id6c1135838a71faecce17ba959a2dcccb0a8cbac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:20:44 +00:00
Julia Reynolds
e1725f466c [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 541f64ddfb -s ours am: 25a49730f4 -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: I324ac3b5ad3e6699d3ff65a98c33016ae189f5db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:13:23 +00:00
Julia Reynolds
39d4202376 [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 91b26eced9 -s ours am: c9ea4e256f -s ours am: b052216194 -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: I64600327d4a3898eed9ee1765e5c39160d0aefe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:06:04 +00:00
Julia Reynolds
6b59063d2e [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 91b26eced9 -s ours am: c9ea4e256f -s ours am: adc9f1de25 -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: I99ea626e22c4771264a6bbf44bb3ba9a55360f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:59:09 +00:00
Julia Reynolds
b052216194 [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 91b26eced9 -s ours am: c9ea4e256f -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: I9df770aab5bd5f0d7211b90b47eac951462fa714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:58:53 +00:00
Julia Reynolds
adc9f1de25 [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 91b26eced9 -s ours am: c9ea4e256f -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: If29126847741f7949e3eb5d13c9f6fc53b1674ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:56:30 +00:00
Julia Reynolds
c9ea4e256f [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 91b26eced9 -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: I8f0192c2c297baccb05c7788f6652528b5997982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:51:00 +00:00
Julia Reynolds
25a49730f4 [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 541f64ddfb -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: Ic674c116e818bdfd09393048a400a766a77f8c12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:50:10 +00:00
Julia Reynolds
cc3edfd2c7 Validate config activities with their rule owners am: 65b18b5e69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215

Change-Id: I844f7e5eeefced63bca9d9baf7b41d1f9b7ac277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:26:47 +00:00
Julia Reynolds
541f64ddfb [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: I8c9a0036519c37474da516184f0b1a8503c389bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:26:13 +00:00
Julia Reynolds
91b26eced9 [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: I0f3113cbd1246e62bf2956551e5e659e49c6de87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:25:35 +00:00
Bob Badour
11411e187b Fix permissions for internal links. 
Test: m droid dist

Change-Id: If872d5e91a78d8f407e618a2c655c8cf4ac7d7fc
 2022-08-10 14:21:47 -07:00
Julia Reynolds
42e9a0cf0d [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721

Change-Id: Ida93487ec0bd4a6bf25b93a1dd990f9d10f23fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:53:46 +00:00
Treehugger Robot
4cfe8b60be Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983bf am: 4967e754eb am: f6e91b15da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181975

Change-Id: Idd403862e3246f54819ad23e66ec2dc64ae99024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 18:16:29 +00:00
Treehugger Robot
f6e91b15da Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983bf am: 4967e754eb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181975

Change-Id: Iff33f61f11f502870320fe85c93a7012a0a2e286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 18:00:04 +00:00
Treehugger Robot
4967e754eb Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983bf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181975

Change-Id: Ie48078a7c33f40939b9d49140875ec7a02582ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 17:41:35 +00:00
Treehugger Robot
3bd3f983bf Merge "Fix SIM name in Network Details to show the selected SIM." 2022-08-10 16:46:49 +00:00
Julia Reynolds
59ca26589e Validate config activities with their rule owners 
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
 2022-08-10 14:20:54 +00:00
Julia Reynolds
b161a3b850 Validate config activities with their rule owners 
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
 2022-08-10 14:20:22 +00:00
Julia Reynolds
65b18b5e69 Validate config activities with their rule owners 
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
 2022-08-10 14:19:14 +00:00
Bruno Kremp
b204960ea4 Fix SIM name in Network Details to show the selected SIM. 
When dual SIM cards with same Carrier Id inserted, authentication of
SIM base network is via default data SIM. However, SIM name shown in
Network Details is always the one inserted first.
Hence, make SIM name of default data SIM shown in Network Details
preferred to keep consistent with the one used for authentication.

Co-authored-by: Yibo Wang <yibo.x.wang@sony.com>

Test: manual test
Bug: 240732444
Change-Id: Ibd64189d6c25b5a64881a0ad9d40854df93481f4
 2022-08-10 15:09:49 +02:00
Jeff Sharkey
8498c4f3d4 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f am: 04cdd54030 am: 8c5c4a7a76 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: I6c2af498637ae8766790bc0d348be8a8173e74dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:42:53 +00:00
Jeff Sharkey
8c5c4a7a76 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f am: 04cdd54030 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: Ieca0de6f73bb0af73988ceb9c5c08af0044c3566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:16:02 +00:00
Jeff Sharkey
04cdd54030 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: Ice243d4b3231199f16d9b59a208867c0986b0d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:48:33 +00:00
Jeff Sharkey
f37834c09f Merge "Migrate stringslint.py to AyeAye." 2022-08-09 17:29:23 +00:00
Himanshu Rawat
245a52c010 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 6d05b035d1 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651

Change-Id: Idf957cd9af66d98c320c36b4d06875840a9eb16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:08 +00:00
Himanshu Rawat
e8dc99088c [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 6b7e6b9fcd -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651

Change-Id: I89e332a273db1c01eef63f7c560ffad79db383c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:07 +00:00
Himanshu Rawat
58834bca2c [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651

Change-Id: Ieff7ef668240ea57dfc5d098252a680a6eace1fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:02 +00:00
Himanshu Rawat
99d6748582 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651

Change-Id: I4b52705de96200bf8fb5bb551a43f1bf51409dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:00 +00:00
Himanshu Rawat
12705de9c8 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651

Change-Id: I2ecc3ff311794336743d574f75054bae032375e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:05:42 +00:00
Himanshu Rawat
02062edb25 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651

Change-Id: Ie9b244a71a6fdebe3a7b10425fe0061e23f19d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:05:41 +00:00
Himanshu Rawat
6d05b035d1 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651

Change-Id: Ic8a8b0b5165d6d433331e3c3acac9f1042c76428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:04:21 +00:00
Himanshu Rawat
6b7e6b9fcd [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651

Change-Id: I4ad185ed4f71048d2aeb756cf1384e06452dc2ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:04:17 +00:00
Himanshu Rawat
f073d27097 Merge "Don't cancel passkey entry pairing autonomously" into tm-dev 2022-08-09 06:42:00 +00:00
Automerger Merge Worker
355cf5534b Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: ba8de85603 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: 0cf4c34624 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 4f7ff2683a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours am: 6c210588fc -s ours
 2022-08-08 14:45:54 +00:00
Bill Yi
400ee96a23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: ba8de85603 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238

Change-Id: I544c7dee0d3cc8a4aaa34e2d2043e38dccf05cde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:25 +00:00
Bill Yi
fe6ade2ec2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: 0cf4c34624 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238

Change-Id: I231dcc9587b3aafbbbff1e4291c2ba3f2dad27fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:18 +00:00
Bill Yi
c46f4b35fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 4f7ff2683a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235

Change-Id: Ic6d63b2a784aad8e66dd7c3b1ebe58a54a840850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:06 +00:00
Bill Yi
de8d1f362e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: e1617e2547 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238

Change-Id: Icda5c5c8012ea5a9fbf415b6abf8e6baa451a891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:42:57 +00:00