PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,712 Commits 1 Branch 0 Tags
aaa90f13255a4b4e7e53fa32b8c0323521db923c
Commit Graph

125712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
a339146ee8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033 -s ours am: d25d75be91 -s ours am: 0534bf419b -s ours am: 717020a165 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic284b91e3e626087a267a7fa90f0c0d4706a47f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:45:42 +00:00
Bill Yi
c4c2e3a865 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683 -s ours am: afc79889f6 -s ours am: 49948acea6 -s ours am: 7b72ddf8b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I921e1bde19d5f69ab0d14254b5673d1d4fcbd217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:45:40 +00:00
Treehugger Robot
64b2644c30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours am: e46c4e5a87 -s ours am: 1f1a6ee337 -s ours am: 300c130a64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I294825ab0cfacef2ab0dddb5357c8e4554f30686
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:45:30 +00:00
TreeHugger Robot
700e460908 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: 2c750a41f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I4225ad17510c125b59696f6caf78459f8ae161a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:44:49 +00:00
Treehugger Robot
f4c61c812a Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: 7e99eaa9bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I4c015dba412ce513992e60cb20164da5ffdc3816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:44:37 +00:00
Lin Yuan
5d330487ba [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14 am: 29d5694857 am: 3d8e6a6caa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I22e417546e6b53092267d145c6cfd2151b5dbb53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:44:27 +00:00
Treehugger Robot
39522cb473 Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: 19a610e0f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: Ie4345b664a3f0d3db69afc4c121f32b2aff6f0ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:44:08 +00:00
Tom Hsu
f23adec53e Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: Iff62b8e3b4e60e501a34cbd4bb12914490b0857c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:43:06 +00:00
TreeHugger Robot
a9ce3ae056 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: 2c750a41f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I111b206de6a699d049dee9845053949c693a699d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:40:52 +00:00
TreeHugger Robot
e3d4a824b7 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: 43e329e463 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I6a7ab94f051d2a0e801af52b32633a5a440e4c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:40:39 +00:00
Treehugger Robot
eb960845fa Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: 7e99eaa9bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: Ibe65cfc9bad66afb9a5e4d24399ddcfad9d484c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:39:07 +00:00
TreeHugger Robot
b4d3bd6859 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I3b6bd741adafcb423b9e2398b5a2c7fd00a0bedd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:38:50 +00:00
Treehugger Robot
7eb1826cf6 Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: b3d65a57af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I2993195910a00b9c87c969f9ad28b44343ac36bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:38:49 +00:00
Treehugger Robot
663a43e79f Merge changes from topic "tc_change_23050307_55" into tm-qpr-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dc96a91fff
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-04 04:36:14 +00:00
Treehugger Robot
14cdc33fb7 Merge changes from topic "tc_change_23050307_55" into udc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dc96a91fff 2p: 98c8d85c26
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dc96a91fff
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-04 04:36:14 +00:00
Treehugger Robot
11ba47eebb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-05-04 04:36:13 +00:00
Tom Hsu
99e03458fa Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev 2023-05-04 04:21:51 +00:00
TreeHugger Robot
2c750a41f4 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I831234e174a614c1b6ce20f9ae6a70cfe9b92b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:21:34 +00:00
TreeHugger Robot
43e329e463 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I43d1b9a2f326aea6a8ad8d40f3f5cd024120d75f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:21:28 +00:00
TreeHugger Robot
5b94c7513c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6759c1f3bc -s ours am: 8637080247 -s ours am: 47bc907c4a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28058ee23ecfeb4c4009d8da2d09b27f7224df7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:17:35 +00:00
Bill Yi
e51d036fad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d0ccf90c -s ours am: 1adffba000 -s ours am: 9b7235aee0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a6bfbe80395f60e670ff1fdaff1dd39c256b0f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:17:32 +00:00
TreeHugger Robot
6ba02c9dc2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5b29767921 -s ours am: 68f57638ac -s ours am: 9f6c9f593b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6bdbff04e04cc2eb56b05dc57445e3afb4aa4345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:17:30 +00:00
Bill Yi
29fedd6bf5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e2f1374d0 -s ours am: d3507f7c4a -s ours am: 825ca04e00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68869bcf729dd1474791e0de289463b70aa2617c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:17:10 +00:00
TreeHugger Robot
7fb7e7d73b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: b4d72181f8 -s ours am: e9ed487381 -s ours am: 69e8954e1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia60baf47ad24d1aacb853ce84c441ed85e56fc3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:16:46 +00:00
Bill Yi
8e42fb4538 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c206bd1217 -s ours am: a91419849d -s ours am: 142b3fc140 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8e5774f98e9c8502d1f40a552c98b439e5dde84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:16:27 +00:00
TreeHugger Robot
7bf4c8f9f5 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev 2023-05-04 04:09:13 +00:00
Lin Yuan
0c20a3de9a [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9 am: 19eb02122b am: fbd437f883 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I156fb4c6df7d5f66292cf711bd2a718ae2282d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:01:56 +00:00
Lin Yuan
c5d2362731 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14 am: ba360fb0a8 am: 451d363161 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Ie788d45a0d7af9360f4b4c8cbda27f2a1cad42d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:01:44 +00:00
Treehugger Robot
7e99eaa9bc Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I04ced0608e4e782af915767ff477cca01b369d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:00:30 +00:00
Treehugger Robot
b3d65a57af Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I12332396bed68d97d711926f8d3dc076864ca1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:00:30 +00:00
Treehugger Robot
19a610e0f1 Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: Ic56a9b910f78144fc43fc713a7baca1cdcc10b6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:55:36 +00:00
Treehugger Robot
d345ba6a4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours am: cfaa877732 -s ours am: b42e6153f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6eea846dc2285a2a8dbe9471c9a74ae55b76067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:55:12 +00:00
Treehugger Robot
c8225b692a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9 -s ours am: f9e3b286f3 -s ours am: 08d728c8f4 -s ours am: 820e4bf1cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38ea40b853b554e4d87421d6c4455a2d57b88380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:52:45 +00:00
Bill Yi
7be9aaeab6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c -s ours am: 77e56766c3 -s ours am: 81a9f0e818 -s ours am: 7922024c20 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4194ba8e99dcd16caf826cff7e2db788dd15d98a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:52:34 +00:00
Treehugger Robot
cc7068328f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours am: e46c4e5a87 -s ours am: d3b8f7769f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32222d11ea3b1e8fce5c1a4f545bb288bf97cc6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:38:30 +00:00
Treehugger Robot
e71643efac Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev 2023-05-04 03:15:40 +00:00
Lin Yuan
fbd437f883 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9 am: 19eb02122b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Ifd1dc47361a410e25bc37ad928836cc8bd13845f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:13:34 +00:00
Lin Yuan
451d363161 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14 am: ba360fb0a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I1e7993a52503d2d205f824bc61ab84ef87a71de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:13:25 +00:00
Lin Yuan
320fd0eccf [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9 am: ec574d6fe5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Ia48444200c199ab7e64e7f1a25c7d679fbc8265c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:13:04 +00:00
Lin Yuan
ebbc27605a [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14 am: 5a099fab45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I576cdbb2a305313758ca006624f56142ea0a0648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:11:51 +00:00
Lin Yuan
c0c804c9b3 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9 am: 19eb02122b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I4c6c9e5d9477448aff00e8f7a8dca78b814e12f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:09:19 +00:00
Lin Yuan
96f35321cc [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14 am: ba360fb0a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I9c27eda1ddc2375f1f5c36a3a612f20696329679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:09:09 +00:00
Automerger Merge Worker
f1f255e34c Merge changes from topic "am-8cb85c2d51a348c580a82e26ddd8d05c" 
* changes:
  Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62 am: 61f1af73e6 am: 9cdbbc334e am: 47e542d48a
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe am: 7951afa544 -s ours am: 44d28ab6f5 -s ours am: cc1284d1e2 -s ours am: 9b1094e52a -s ours
 2023-05-04 03:04:46 +00:00
TreeHugger Robot
e397be9f9e Merge "Change MonitoringCertInfoActivity exported flag to be false." 2023-05-04 03:04:41 +00:00
TreeHugger Robot
5081cc5afe Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62 am: 61f1af73e6 am: 9cdbbc334e am: 47e542d48a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410

Change-Id: Ifcf4982914dfdf689c49388ae0523d8977c92429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:04:38 +00:00
Bill Yi
7d86d1f8f5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe am: 7951afa544 -s ours am: 44d28ab6f5 -s ours am: cc1284d1e2 -s ours am: 9b1094e52a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d0c1405d362b5c59eee0a3f4ae730f0ac0ce7b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:04:32 +00:00
Treehugger Robot
c81723c9e2 Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586 am: 48f8eecbd1 am: 089c61b6ae am: 8df2ac3f94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411

Change-Id: I40bc0fb0e4d8e1cb4ab8a55adfd08620aac574ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:03:58 +00:00
Bill Yi
77846213de [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f am: aa9489179b -s ours am: 20a33c9bdd -s ours am: ca3c627645 -s ours am: 3e9797b743 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44d640e56e17d232083bbb18e65fd3537964469d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:03:54 +00:00
Treehugger Robot
9504455518 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033 -s ours am: f84817da57 -s ours am: 989436c29a -s ours am: 3cfa15c482 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0ec85e38927d6fd2eff40cceecfe08a63d50e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:03:09 +00:00
Bill Yi
5b4853777e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683 -s ours am: cf281ffe95 -s ours am: c8907529e0 -s ours am: 9733ac707a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib8ffefc87c99d5600b5bfdea95104ce45f7867b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:03:06 +00:00